From: Joey Hess <joey@kitenet.net>
Date: Sun, 15 Jan 2012 20:28:51 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120115~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1d356fdf8b826ac564d8e04d32785367f53e4556

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

1d356fdf8b826ac564d8e04d32785367f53e4556