From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 21:26:40 +0000 (-0400)
Subject: Merge branch 'master' into file_pruned_revamp
X-Git-Tag: 3.20100427~93^2~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/808a4249fc7f20fe66dd01cd0586919879075d32

Merge branch 'master' into file_pruned_revamp
---

808a4249fc7f20fe66dd01cd0586919879075d32