From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 16 Jul 2009 18:46:09 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.14159
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ec5bbedac01fb6a6a9013a389d9273893515c6e;p=ikiwiki.git

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

7db41e1aa97f5f30a9bb523c939cce192cc104c7