Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 26 Nov 2013 09:53:44 +0000 (10:53 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 26 Nov 2013 09:53:44 +0000 (10:53 +0100)
commit64b9b93eb4688f78b97ee375385b2ca37b7625aa
tree2d8282a83e5328833db61d0dfd6ffa918fd44b13
parent6799e9eab0619598ece481243277b4b9f1d42db4
parent041e75d1c099a937a16759ad40aee4d83e2316f6
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ia5060cb07311256caa0a8c7f03af292ce3a26213