Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 14:06:32 +0000 (16:06 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 14:06:32 +0000 (16:06 +0200)
commit7899765f22b31f0c1f1ac6db23988a594dc08fda
tree3db4c99de16c14220d66f3c0432f01213b026602
parent9c79ef0046c550614964afb8feb734c96853691c
parent95fca593cb08b3755cc72df6169afad9f75f0a7f
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I3e4b4a41d1d55a2e78ee560c68d6e7cdcc35a6b9