From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 29 Mar 2009 18:31:40 +0000 (-0400)
Subject: Merge branch 'master' into po
X-Git-Tag: 3.15~194
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ef69a6cce5a09e9972441b034e24076027fbc479

Merge branch 'master' into po
---

ef69a6cce5a09e9972441b034e24076027fbc479