From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Dec 2008 20:08:32 +0000 (-0500)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.00~4^2~4
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1ca191b5707ef38af5cbe196e314d57cd5c8c065

Merge branch 'master' into next
---

1ca191b5707ef38af5cbe196e314d57cd5c8c065