From: Joey Hess Date: Wed, 10 Oct 2012 14:43:36 +0000 (-0400) Subject: Merge branch 'master' of git://github.com/wking/ikiwiki X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0c22e0f29a8bad1dadec94f4d0dee27f9cc87d10;p=ikiwiki.git Merge branch 'master' of git://github.com/wking/ikiwiki --- 0c22e0f29a8bad1dadec94f4d0dee27f9cc87d10