From: Jenkins CI <ci@sonarsource.com>
Date: Fri, 21 Nov 2014 07:01:51 +0000 (+0100)
Subject: Automatic merge from branch-4.5
X-Git-Tag: 5.0-RC1~280
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=159a1ec9a7707ba711bae8fe6477d579f11d68d3;p=sonarqube.git

Automatic merge from branch-4.5

* origin/branch-4.5:
  Fix javadoc
  Fix cancelling of editing of rule tags
  Fix flash vulneribility
---

159a1ec9a7707ba711bae8fe6477d579f11d68d3