Merge remote-tracking branch 'gerrit/btle' into 5.4
authorAlex Blasche <alexander.blasche@digia.com>
Thu, 14 Aug 2014 07:57:07 +0000 (09:57 +0200)
committerAlex Blasche <alexander.blasche@digia.com>
Thu, 14 Aug 2014 07:58:35 +0000 (09:58 +0200)
commit67d8044bcc330d9aa139ed3026b6b0603a7a990a
treeeba72249447d6e2a3f28ed5b2cbfb351a0bc2053
parent687c885b8625374433f4ccc8b6442ea72ea62d46
parent05dc94529b1a8f7c65c8aebbf8081d1d1f3aa96a
Merge remote-tracking branch 'gerrit/btle' into 5.4

Change-Id: I6786b50e3f302c6027255dc2393b3e7923705a1d