From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 17:44:27 +0000 (-0400)
Subject: Merge branch 'master' into cvs
X-Git-Tag: 3.14159265~75
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=81a9b5feffa241cea901c3633323bb446d61edf3;p=ikiwiki.git

Merge branch 'master' into cvs
---

81a9b5feffa241cea901c3633323bb446d61edf3