Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:56:16 +0000 (12:56 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:56:17 +0000 (12:56 +0200)
commitf15105a02dc1c6b2b95b8ab0dafd36098840fb0e
tree43496eee1f7b0621fe8cabcd295b68d0aade28d0
parent1b563aca1a98760c9dded9e8a3d4eb726abb0ae2
parentd7dd22b9955ffde6d3c663655d9f9d4a58ca3894
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I15d0b9f03136840aff189ffb9de6e3899c204ca2