From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 26 Mar 2009 18:04:42 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.09~47
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/de116df11bae9ad04a23bad2031357cf39a4d039

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

de116df11bae9ad04a23bad2031357cf39a4d039