From: Jenkins CI <ci@sonarsource.com>
Date: Fri, 27 Feb 2015 17:24:12 +0000 (+0100)
Subject: Automatic merge from master
X-Git-Tag: 5.2-RC1~2678
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6c2a68be94ec4c43e012a22276b24ce8c639f6c1;p=sonarqube.git

Automatic merge from master

* origin/master:
  Test internal Git merge tool
---

6c2a68be94ec4c43e012a22276b24ce8c639f6c1