From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 28 Aug 2008 19:03:26 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.63~59
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9b21a540dd54da0da6ec85c5a427cefbd1a0116b

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

9b21a540dd54da0da6ec85c5a427cefbd1a0116b