Merge remote-tracking branch 'origin/5.6.0' into 5.6
authorLiang Qi <liang.qi@theqtcompany.com>
Thu, 31 Mar 2016 07:53:10 +0000 (09:53 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Thu, 31 Mar 2016 07:53:10 +0000 (09:53 +0200)
commitc80e96bb09ebcf0b031843b58efb4ef037246bf1
tree717a6bf41b08ff1b3ddb43e9b003fc9b7a40a2e1
parentf05fece2f774137a08a1578ed2499f4890aee799
parent84a1676ed6566d548f2cce35ced9c0524f41c349
Merge remote-tracking branch 'origin/5.6.0' into 5.6

Conflicts:
.gitmodules

Change-Id: Ic9c8564006c2722f925700f09ff42da3e912f580
.gitmodules
init-repository