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

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

c22b9386314b63bb285bd514425fc640bcfff390