From: Joey Hess <joey@kitenet.net>
Date: Thu, 5 May 2011 20:23:47 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110431~129
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e3596dbaecb69711616b7bf3b3ef363ee5929293

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

e3596dbaecb69711616b7bf3b3ef363ee5929293