From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 4 Feb 2010 20:07:30 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100212~68
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c6538d56f0cb705fbbd2591de4a726e174ed025b

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

c6538d56f0cb705fbbd2591de4a726e174ed025b