Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 26 Nov 2013 09:54:38 +0000 (10:54 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 26 Nov 2013 09:54:38 +0000 (10:54 +0100)
commit564a28dacd5e9c6705e2b79cae88a7f037e257cc
tree0fa40ffe7b4fe18086fe3ff08b0089a5519a7370
parent75ff4069a664117a5301814f7e831c262bb6b3e3
parent9ca1e89e0d7e11b9db60d7fcf7399c655bd0e31e
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ief9594bded2d96bdd3fc6b0e033df4511181bf7c