Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 18 Nov 2013 11:27:58 +0000 (12:27 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 18 Nov 2013 11:27:58 +0000 (12:27 +0100)
commitcfcd489f269746c501259f1fdb8741e20c9a3fa6
tree11b683a14cbf2338833ec2e278fc637ab195c59b
parentb430aa843350fe5cad777055708af403d3d1dd74
parent031557fc72073e4bda24ecf550c74c3105a154b3
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I65967ee732dcf83df3dffae42c854965aec646fe