From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 12 Dec 2008 19:21:08 +0000 (-0500)
Subject: Merge branch 'master' into comments
X-Git-Tag: 2.71~93
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=41efa5ac923c47ebd5538ee5894b11e9ccf7637c;p=ikiwiki.git

Merge branch 'master' into comments
---

41efa5ac923c47ebd5538ee5894b11e9ccf7637c