From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 9 Feb 2010 21:25:45 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100212~41
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/246ca5ab0a6b437e3d5c8ae661e76762e52d5d65

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

246ca5ab0a6b437e3d5c8ae661e76762e52d5d65