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

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

9aaae1b2ded1cf90c570bfb5f8dc61c29f244d6f