From: Joey Hess <joey@kitenet.net>
Date: Mon, 29 Nov 2010 16:06:26 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101129~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a3672af973563dc13b4da56e3d8c58064b67edd7

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

a3672af973563dc13b4da56e3d8c58064b67edd7