From: intrigeri <intrigeri@boum.org>
Date: Thu, 13 Nov 2008 03:39:53 +0000 (+0100)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.15~323
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3190e5cea75a43d38f58b8a45fbc87d5527d18f0?hp=3190e5cea75a43d38f58b8a45fbc87d5527d18f0

Merge commit 'upstream/master' into prv/po
---