Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:28:22 +0000 (16:28 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:28:22 +0000 (16:28 +0200)
commit0f43e5c7671d47dbb92efa597cc39732239b85f1
tree6aa9ad9224420fadee5fa6028d429f60de412a13
parent34467db6c30807a5f5979e7f2807e7b4f8cfb469
parenta85df53ba66be439d775abbe9280ddcffd45d05c
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ic056eeec62fbbbf5c932d8e862736f368833f34d