Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 12:58:25 +0000 (14:58 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 12:58:25 +0000 (14:58 +0200)
commitd07d47cf85f4026c8cb508fe9977fff5ffdbd810
tree2f5aada962220d0433569fbbf93cb0b2df880461
parent06cb2a8e5931c40dcd9c1d26b19d356857b019c5
parent7b6a627315f012598dca23d3ff978a09bfba7969
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5e1eb924132b9f1a032886d3b6c0e16bcc623fa9