From: Joey Hess <joey@kitenet.net>
Date: Thu, 24 May 2012 20:33:15 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120629~53
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/41aee342747c1f06d526c8851c6fc7f11b455e41

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

41aee342747c1f06d526c8851c6fc7f11b455e41