Merge dev into 5.6
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Mon, 17 Aug 2015 18:09:49 +0000 (20:09 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Mon, 17 Aug 2015 18:09:49 +0000 (20:09 +0200)
commit9c9fca5e27bd91da1ea07bebd7569049493c5ccf
treedd3b49b40ed01cad1c2cdc206ec73271bca6e942
parent94e337fa95425d259e81b4d21f4d0853108553bd
parent668ccf18dc8d5ddf403667f19a5b08f2b7c18639
Merge dev into 5.6

Change-Id: I9ec05838f3c4cbc11fb969c71daf5c2a5a8df360