Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 12:53:29 +0000 (14:53 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 12:53:29 +0000 (14:53 +0200)
commite2a34bf7acd54a17279c0cfbec4cb37b0a61c2f0
tree86310c8d33892478f6c0e8a565a93d04d20e42be
parent62bfd01aa5b30f9af9e3d2fff3c9430705134b26
parent4c94a3ca55e82ade19ff5d4ab361d40e6252f2da
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ieb4590cfd49bd002f0ae0b4799e39b5a402900fd