Jasper Van der Jeugt 4c40cea9e1 Merge branch 'master' into dev-metadata-route ... Conflicts: tests/Hakyll/Core/Rules/Tests.hs		2013-02-16 13:01:57 +01:00
..
Tests.hs	Merge branch 'master' into dev-metadata-route	2013-02-16 13:01:57 +01:00