From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 23 Oct 2008 17:45:42 +0000 (-0400)
Subject: Merge branch 'master' into git-anon
X-Git-Tag: 2.68~105
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bdbbca09c3a18510429934ffbad846ae64d7edce;p=ikiwiki.git

Merge branch 'master' into git-anon
---

bdbbca09c3a18510429934ffbad846ae64d7edce