Merge remote-tracking branch 'origin/5.6.0' into 5.6
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Fri, 12 Feb 2016 10:18:27 +0000 (11:18 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Fri, 12 Feb 2016 10:18:27 +0000 (11:18 +0100)
commit4007fc7a26642285d82acdd1ce3caecd9ec49cc2
tree5f41a62afc54069eeb42641eec904efc5460f51d
parent1fcdb6cafcf7621fdea84e28a95934a4a04ea1b7
parent37c75a23e8d17893ec9c1bf2a4615ea3876f4204
Merge remote-tracking branch 'origin/5.6.0' into 5.6

Conflicts:
.gitmodules

Change-Id: Ic3c425211f24b0dc3a341cac7d9fd9d0b7edac03
.gitmodules