From: Joey Hess <joey@kitenet.net>
Date: Sat, 20 Nov 2010 18:54:51 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101129~33
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a2c040f1fc565b546750e014df2e412ab0e68cc1

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

a2c040f1fc565b546750e014df2e412ab0e68cc1