From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 16:59:57 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100403~83
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b10c6dd631496df972177d8673d40d77bb441644;p=ikiwiki.git

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

b10c6dd631496df972177d8673d40d77bb441644