From: Joey Hess <joey@kitenet.net>
Date: Sat, 25 Aug 2012 14:43:37 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120725~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5fa605beada972eb32ca781ee420cc69e1732e20

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

5fa605beada972eb32ca781ee420cc69e1732e20