From: Roland Mas Date: Wed, 7 Nov 2012 16:41:10 +0000 (+0100) Subject: Contentless merge from 5.2 X-Git-Tag: v5.3-rc1~1778 X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=e500d3b3b7d7cd4d661358900e75e666cfcf0078 Contentless merge from 5.2 --- e500d3b3b7d7cd4d661358900e75e666cfcf0078