Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 12 Dec 2013 17:03:14 +0000 (18:03 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 12 Dec 2013 17:03:14 +0000 (18:03 +0100)
commit63db3b49e7134d5f65437437b49750c68bb37699
tree019ea2c195c19ca8e1778f3c19e52d56ae94412f
parentf31505c3ea464d2e200504a6280b3ba982b6e724
parenta60aa90f5ca00e32a1271a476f5da650dddebfda
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ife41f7baf8113951233186f106cdc9c1b2e2bc55