From: Joey Hess <joey@kitenet.net>
Date: Sat, 25 Aug 2012 03:00:35 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120725~28
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3da366b44bb4a8e5c863e91adbc93158bc548e60

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

3da366b44bb4a8e5c863e91adbc93158bc548e60