Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Mar 2013 08:25:25 +0000 (09:25 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Mar 2013 08:25:25 +0000 (09:25 +0100)
commitea98b4694c7a0674293e71cb20c15c3607cfb258
treeb3ad5b2898c579af1f583556fbb87a17f9f71db0
parent4bddc101ea7bace61397f44a0f7e9a9f92c92f09
parent8b76d788604ff4e89198813c542e6bb440b202fb
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ic32eb7c209f299f8a677fd7f247d4800eaafa879