From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 30 Aug 2009 18:38:19 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.1415926~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6646841fa2c659153c44f73c0da846ef9829b8be;p=ikiwiki.git

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

6646841fa2c659153c44f73c0da846ef9829b8be