From: Joey Hess <joey@kitenet.net>
Date: Mon, 18 Mar 2013 14:49:16 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130504~60
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/158d6777a6f7294009a26d8210befc5185f5e056

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

158d6777a6f7294009a26d8210befc5185f5e056