Merge commit 'f1fa4be793dcadbd6628150d24e441c2095e0a54' into HEAD

author Jenkins CI <ci@sonarsource.com>

Thu, 10 Jul 2014 06:01:48 +0000 (08:01 +0200)

committer Jenkins CI <ci@sonarsource.com>

Thu, 10 Jul 2014 06:01:48 +0000 (08:01 +0200)
author Jenkins CI <ci@sonarsource.com>
Thu, 10 Jul 2014 06:01:48 +0000 (08:01 +0200)
committer Jenkins CI <ci@sonarsource.com>
Thu, 10 Jul 2014 06:01:48 +0000 (08:01 +0200)
diff --cc sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java
Simple merge
author	Jenkins CI <ci@sonarsource.com>
	Thu, 10 Jul 2014 06:01:48 +0000 (08:01 +0200)
committer	Jenkins CI <ci@sonarsource.com>
	Thu, 10 Jul 2014 06:01:48 +0000 (08:01 +0200)