From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 18:15:32 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.14159265~75^2~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e9c9952b11626cdcce55e5dca8b542f5708c72ed;p=ikiwiki.git

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

e9c9952b11626cdcce55e5dca8b542f5708c72ed