From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 11 Jul 2009 04:33:32 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.14159~18
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d5be42a0910a1f0b0f6a9796fdbb43d1f02284f2

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

d5be42a0910a1f0b0f6a9796fdbb43d1f02284f2