From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 17:43:21 +0000 (-0400)
Subject: Merge branch 'master' into file_pruned_revamp
X-Git-Tag: 3.20100427~93^2~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ca33969823342c3c61219a2cb167e40f765f934b;p=ikiwiki.git

Merge branch 'master' into file_pruned_revamp
---

ca33969823342c3c61219a2cb167e40f765f934b