From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 31 Dec 2008 18:33:10 +0000 (-0500)
Subject: Merge branch 'next'
X-Git-Tag: 3.00~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ffec6806087981420eaf83c8d83cc4523a46d0de;p=ikiwiki.git

Merge branch 'next'
---

ffec6806087981420eaf83c8d83cc4523a46d0de