From: Joey Hess <joey@kitenet.net>
Date: Tue, 19 Apr 2011 21:47:40 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110430~34
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ff03d125be4df039489baea31b86ef273486d0d7

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

ff03d125be4df039489baea31b86ef273486d0d7