From: Joey Hess <joey@kitenet.net>
Date: Thu, 16 Aug 2012 00:27:27 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120725~31
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/16a8a0e1e29e2ab197012972230760d0e71412fb

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

16a8a0e1e29e2ab197012972230760d0e71412fb