From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 6 Nov 2008 21:05:23 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.69~31
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/72c03656f91db1e9eff1f9d8251c8baeffef10f7?ds=inline;hp=-c

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

72c03656f91db1e9eff1f9d8251c8baeffef10f7