From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 19 Nov 2008 22:31:17 +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/276b814bb9f53291f1ebe1cc510d49f1ba4719c8

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

276b814bb9f53291f1ebe1cc510d49f1ba4719c8