From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 4 Sep 2008 18:13:26 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.63~22
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c427ab7ccbe6c5fe43602a724bbeab454d50195c

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

c427ab7ccbe6c5fe43602a724bbeab454d50195c