Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:28:12 +0000 (23:28 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:28:13 +0000 (23:28 +0200)
commit51bfca71778781f993a02445c6ee1493be1e5528
tree339145d7efe1c581eb9c8d0151b32f28981395e6
parentc53cfbaefa8dc3d4748307de270c9dfaed0ef181
parent4e26c57bd905a9ea44634014cc7f44e79f8d4eba
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I7ca374a1c97a80238af7d6471626ec8db94a5990