From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 21 Dec 2008 06:04:03 +0000 (-0500)
Subject: Merge branch 'master' into comments
X-Git-Tag: 2.71~11^2~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7304d6bd72cd2e7081287675f72fb0ded8209aaa

Merge branch 'master' into comments
---

7304d6bd72cd2e7081287675f72fb0ded8209aaa