From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Dec 2008 19:59:48 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.00~6
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/82e6902a67ac5ad06a9174c240b7f521daa6c21e?ds=sidebyside

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

82e6902a67ac5ad06a9174c240b7f521daa6c21e