Merge remote-tracking branch 'origin/5.3' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 22 Jul 2014 18:23:12 +0000 (20:23 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 22 Jul 2014 18:23:12 +0000 (20:23 +0200)
commit86d5c7e4dc7258c3fea26f34b2076a52e292e81c
treeb0e96bb12880fb6070272995d9f9843149f6ee23
parent39c269441421e1e61fbfc698b65f769db82cad56
parent2bc7a39a0d01498567aef958908b4bdba4071c8f
Merge remote-tracking branch 'origin/5.3' into dev

Change-Id: If8e5050901a320f1ff692e842f173c0062bed5fe