From: Joey Hess <joey@kitenet.net>
Date: Sat, 23 Oct 2010 21:25:25 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101023~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/42e97a4a69581c9a2a8198f8149c5feece09cee5

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

42e97a4a69581c9a2a8198f8149c5feece09cee5