From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 22:18:39 +0000 (-0400)
Subject: Merge branch 'file_pruned_revamp'
X-Git-Tag: 3.20100427~93
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=64946f91982d85bb301cc9241459939c657d0eb9;p=ikiwiki.git

Merge branch 'file_pruned_revamp'
---

64946f91982d85bb301cc9241459939c657d0eb9