From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 17 Feb 2009 18:10:35 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.05~49
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/532bf02e0681f32c2f115adf8c3347f818ffd54e?hp=-c

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

532bf02e0681f32c2f115adf8c3347f818ffd54e