From: Joey Hess <joey@kitenet.net>
Date: Wed, 2 Mar 2011 16:40:57 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110321~14
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/899b8c80a08ef4bf4ebc177045e86859fbef554f?ds=inline;hp=899b8c80a08ef4bf4ebc177045e86859fbef554f

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