From: Joey Hess <joey@kitenet.net>
Date: Wed, 10 Oct 2012 14:43:36 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/wking/ikiwiki
X-Git-Tag: 3.20121016~10
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0c22e0f29a8bad1dadec94f4d0dee27f9cc87d10

Merge branch 'master' of git://github.com/wking/ikiwiki
---

0c22e0f29a8bad1dadec94f4d0dee27f9cc87d10