Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 3 Dec 2013 17:27:38 +0000 (18:27 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 3 Dec 2013 17:27:38 +0000 (18:27 +0100)
commit96c5b7464358b236b866be6d57d4aa340d3ba77f
treee97acd1ff2bee506c22167e1b299e458b960ab96
parent290b28aeda46fa31fde6310e563de3a4736b84c1
parentf141efdc4d81d2ab9042e1ada971c9dce1b8f03d
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I866aa4b65d19c49eca0df97db93dd2833a134d08