From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 04:15:22 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100403~90
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ab89494797ef6e0045428d63251287bbc05fa63b

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

ab89494797ef6e0045428d63251287bbc05fa63b