From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 4 Sep 2009 21:15:11 +0000 (-0400)
Subject: Merge branch 'master' into cvs
X-Git-Tag: 3.14159265~77
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc2bd0afe17a235a0ddfad0a5656c3683d8d180a;p=ikiwiki.git

Merge branch 'master' into cvs
---

fc2bd0afe17a235a0ddfad0a5656c3683d8d180a