From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 2 Jan 2010 20:10:08 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100102.3~5
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1d9a41eecbf7029698aa11b680919864707583ed

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

1d9a41eecbf7029698aa11b680919864707583ed