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

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

50e12b28dbea1bd57377464778ea6a92bd321751