From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Feb 2010 16:50:24 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100302~18
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4b1da14612c26981055dd186deacc004f93bdad0

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

4b1da14612c26981055dd186deacc004f93bdad0