From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 26 Nov 2008 18:29:47 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2b53ce92fdc13526544579220848130a19850b76?ds=sidebyside;hp=--cc

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

2b53ce92fdc13526544579220848130a19850b76