From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 30 Sep 2008 20:35:44 +0000 (-0400)
Subject: Merge branch 'master' into tova
X-Git-Tag: 2.66~34^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2bfbad7af4e3e09287b4c06c958d0929c0c7bc63;p=ikiwiki.git

Merge branch 'master' into tova
---

2bfbad7af4e3e09287b4c06c958d0929c0c7bc63