From: George Shakhnazaryan <george@shakhnazaryan.com>
Date: Thu, 4 Aug 2011 01:51:55 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 2.11^2~153^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3f83aec3ca21cf551c8eb934717814e155b58eab;p=sonarqube.git

Merge remote-tracking branch 'upstream/master'
---

3f83aec3ca21cf551c8eb934717814e155b58eab