From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 20:18:27 +0000 (-0400)
Subject: Merge commit 'schmonz/master' into cvs
X-Git-Tag: 3.14159265~71
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1365ebf12f09be7bd79950b2a01ef14f2b8c796a

Merge commit 'schmonz/master' into cvs
---

1365ebf12f09be7bd79950b2a01ef14f2b8c796a