From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 28 Sep 2009 00:57:45 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091009~96
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/13b525d8eab91e197b8f356c3efb9719513c5983

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

13b525d8eab91e197b8f356c3efb9719513c5983