From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 13 Sep 2009 22:45:45 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.14159265~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e0beca452f7feb019a5d16908b61a233c112c0e;p=ikiwiki.git

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

5e0beca452f7feb019a5d16908b61a233c112c0e