Merge remote-tracking branch 'origin/5.5' into dev
authorLiang Qi <liang.qi@theqtcompany.com>
Mon, 11 May 2015 08:01:37 +0000 (10:01 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Mon, 11 May 2015 08:01:37 +0000 (10:01 +0200)
commit351c30bebb3b7c11cf71a6dab47a446d0af8e486
tree7031e525247062f1e0861c126b357f82a384adb7
parentcaafdaae7139e3477b813b44177692effd2a2209
parente289ead3cd83c4abd74fc4a4ed842c7745a23096
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: Ice083b71518d645bf411f1275826e928df797242