From: Joey Hess <joey@kitenet.net>
Date: Tue, 21 Feb 2012 17:34:13 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120203~137
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e6de25132d55add27432fdbfcda90fd7bc478b0a

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

e6de25132d55add27432fdbfcda90fd7bc478b0a