From: ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com>
Date: Tue, 28 Jun 2016 06:08:24 +0000 (+0200)
Subject: Automatic merge from branch-5.6
X-Git-Tag: 6.0-RC1~247
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a278aa4f3a41b976a5d88c48f035677151c5b454;p=sonarqube.git

Automatic merge from branch-5.6

* origin/branch-5.6:
  SONAR-7798 support BIN and BIN2 collation on MsSQL
  SONAR-7798 mssql fix collation now support complex collations
---

a278aa4f3a41b976a5d88c48f035677151c5b454