From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 00:08:24 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100403~174
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e96aa16ab959e62c4ce826c599e48a959ebc3e64

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

e96aa16ab959e62c4ce826c599e48a959ebc3e64