Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 29 Apr 2013 12:19:05 +0000 (14:19 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 29 Apr 2013 12:19:05 +0000 (14:19 +0200)
commit622d82bdec5a15a039a65e33027ebdeae0fd6d65
tree268f5834acbb737a268c1ba1aa4c4b7444ce7508
parent5357a0a77b00f41cfcdb09cf3fb670be89a6ab20
parent0eaf799d8c36d8d877a43a2f9ee71a1a2f968911
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I9ccc43d03cbd6c7d31c113bc67e5ec91126683cb