From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 23 Dec 2008 21:27:02 +0000 (-0500)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.00~4^2~31
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/6e4f34b0b847ed898cbe3078280d7b5bf4398790

Merge branch 'master' into next
---

6e4f34b0b847ed898cbe3078280d7b5bf4398790