From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 27 Mar 2009 19:51:35 +0000 (-0400)
Subject: Merge branch 'master' into po
X-Git-Tag: 3.15~197
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a4d7ee255961e9d7f2ed75f9775f6d3e3cf47591?ds=sidebyside

Merge branch 'master' into po
---

a4d7ee255961e9d7f2ed75f9775f6d3e3cf47591