From: Joey Hess <joey@kitenet.net>
Date: Thu, 26 Apr 2012 16:54:55 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120516~16
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a29599d68aec2797eb6b3b48c8a151025a4d6fa4

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

a29599d68aec2797eb6b3b48c8a151025a4d6fa4