Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 16 Dec 2013 15:34:15 +0000 (16:34 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 16 Dec 2013 15:34:15 +0000 (16:34 +0100)
commit3f0cf919373e308d7c95fba1b4174c1f0f6eac32
tree458c930a18d14063086253a0ca854d3a37a85038
parentd883ed46150cdebef5fe469d7f5c22c7ae94f11b
parent1cad275b6103ce834c9e1ec5d187e7e97e80a119
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I914a08f02d1bca4402a7c29dd4aedb77c99f6d02