From: Joey Hess <joey@kitenet.net>
Date: Mon, 12 Jul 2010 19:35:40 +0000 (-0400)
Subject: Merge branch 'filter-full'
X-Git-Tag: 3.20100722~45
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fd2b2f386f30cf2ba578da8a8174dd60ae024adc;p=ikiwiki.git

Merge branch 'filter-full'
---

fd2b2f386f30cf2ba578da8a8174dd60ae024adc