From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 18 Mar 2010 03:22:26 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100403~152
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6cae23dbbe073a29400e89236b27ab7718fe2d54;p=ikiwiki.git

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

6cae23dbbe073a29400e89236b27ab7718fe2d54