From: Roland Mas <lolando@debian.org>
Date: Wed, 7 Nov 2012 16:38:23 +0000 (+0100)
Subject: Contentless merge from 5.2
X-Git-Tag: v5.3-rc1~1780
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=8487f17327c5ca12c44ff03007925900f4523821;hp=817c49c7fd08ca506e9a123a9fcaf7f7f4ad4bbd

Contentless merge from 5.2
---