Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 16 Dec 2013 14:33:10 +0000 (15:33 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 16 Dec 2013 14:33:10 +0000 (15:33 +0100)
commit607f693080fdc256895ab2daaf84a1aa4553e001
treee31a13082d0b95e013b21bd9787bdd561f88ca8b
parentab3e8e80fbd81a38039c713189b0422972e0963e
parent0d29579baffd4f31a3ec39590117f4fee821694d
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5cbf1209d614936db36d20ece05922237cbfa562