From: Joey Hess <joey@kitenet.net>
Date: Thu, 20 Dec 2012 19:28:28 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130212~47
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4f274e04544d5cb25f693e3590d32e181a13ea9e

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

4f274e04544d5cb25f693e3590d32e181a13ea9e