Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 26 Nov 2013 09:54:43 +0000 (10:54 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 26 Nov 2013 09:54:43 +0000 (10:54 +0100)
commit155ec2223c8f60ae88dd72e705c3621cf490dac2
tree56dac84375472355936db118252d2cbe49827bff
parentcc83829fde79c21622ca1db16a2e8fdc9bac91bc
parent840e2817de1eda68f656f9764f824898ebf6d9c2
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I9088052f76de19e584cd16fd039502de6b22bec2