From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 31 Jul 2009 08:28:26 +0000 (+0200)
Subject: Merge branch 'master' into staging
X-Git-Tag: 3.15~68
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e78a8c2834e7ad880ab45d26db3a952df8465493

Merge branch 'master' into staging
---

e78a8c2834e7ad880ab45d26db3a952df8465493