From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 26 Aug 2009 17:05:29 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.1415926~61
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b740682f221fe6cf70e083303187843a61956e7e;p=ikiwiki.git

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

b740682f221fe6cf70e083303187843a61956e7e