From: Joey Hess <joey@kitenet.net>
Date: Sun, 10 Feb 2013 16:42:56 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130212~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/22146aa4a34074bed465de7fb5999ea121808524

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

22146aa4a34074bed465de7fb5999ea121808524