From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 15 Jul 2008 01:21:16 +0000 (-0400)
Subject: Merge branch 'master' into aggregateinternal
X-Git-Tag: 2.54~90
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=40b25255ba84c1a0d400b55ec662de01690b5941;p=ikiwiki.git

Merge branch 'master' into aggregateinternal
---

40b25255ba84c1a0d400b55ec662de01690b5941