From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 19:17:53 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.14159265~75^2~10
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ccb1e94076d79c65242bb63ea28412c33f7fc45e?ds=inline;hp=-c

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

ccb1e94076d79c65242bb63ea28412c33f7fc45e