Merge remote-tracking branch 'origin/5.3' into dev
authorSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 19:51:30 +0000 (21:51 +0200)
committerSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 19:51:30 +0000 (21:51 +0200)
commit717ba7e69a1c16f8d4b26984a63b3c0450b131bf
tree362a8a765e256edeacf47b4b172ee5aed7b7c27c
parent0c35647c33a51a2b9ce8319cd18283845aef40a1
parenteb16b1970293dfeb5918751afbdf1fb7f62028e1
Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
.qmake.conf

Change-Id: I8ef1da19810c1bf4d68bf157848bccb5446669cc