Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 23 Jul 2013 09:16:12 +0000 (11:16 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 23 Jul 2013 09:16:13 +0000 (11:16 +0200)
commit4f762295531879bebea763030a6f240b4cad2209
treec6456636b41412fb8481b65c6c018dd765647b27
parent82c37e5a5d4b01132a521bcbb8f14a9031575303
parent808c59c00f23109d1887022c2d9a6f4e5ecc72a4
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I746d5aa3e11e8c01c370db3786788270cdd7c685