From: Joey Hess <joey@kitenet.net>
Date: Fri, 12 Nov 2010 15:06:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101129~74
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f942c2db05e4da9188f36c5df1d42aea709208bf

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

f942c2db05e4da9188f36c5df1d42aea709208bf