From: Joey Hess <joey@kitenet.net>
Date: Wed, 4 Apr 2012 16:59:20 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120419~71
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/46d93629b0b8cff181c665f0932221a6c57956cc

Merge branch 'master' of ssh://git.ikiwiki.info
---

46d93629b0b8cff181c665f0932221a6c57956cc