From: Joey Hess <joey@kitenet.net>
Date: Sat, 30 Apr 2011 16:06:41 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110430~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/272961d7ff952ba1e1c593c74e6b2b805fa53e77?ds=sidebyside;hp=272961d7ff952ba1e1c593c74e6b2b805fa53e77

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