Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 25 Jun 2013 21:24:58 +0000 (23:24 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 25 Jun 2013 21:24:58 +0000 (23:24 +0200)
commit9b02dc08fe4744f2406f6a6b86e91d1331950d21
tree949c7f0bee68195b6acc0c4511a0422e05b4a8ca
parent587e64025f77242cc1f2e756346f24e810595513
parent8c1759ed70da31b2492e9df68fa44eac7db6ab66
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I012213390ffe24567cfadeacbbbb8d14074b887c