From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 10 Aug 2009 20:05:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.15~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7712bb662aa98bc84cf1676500cdfef5d677d704;p=ikiwiki.git

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

7712bb662aa98bc84cf1676500cdfef5d677d704