Merge remote-tracking branch 'origin/stable' into dev
authorSimon Hausmann <simon.hausmann@digia.com>
Mon, 3 Mar 2014 14:40:24 +0000 (15:40 +0100)
committerSimon Hausmann <simon.hausmann@digia.com>
Mon, 3 Mar 2014 14:40:43 +0000 (15:40 +0100)
commit1511dc39a62e9d14b6755d6c2335547c85331d49
tree0b60c51b7597b2fe4ea16a432f4c615214efa0a7
parent75b191b31d9936b134ca9776f1e69e891d03be11
parent915dcb6f8cb6207566f4838f641f434508336fa7
Merge remote-tracking branch 'origin/stable' into dev

This merge also removes the pin for qtbase.

Change-Id: If86998fb912d100cfad150d255ed41544ba1fb0c