Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 23 Jul 2013 09:08:32 +0000 (11:08 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 23 Jul 2013 09:08:32 +0000 (11:08 +0200)
commitb1b31968253d349e17828145ef9d1a706ab4dd53
tree7b23c70d802fcf9fca49099c8d7bfde26221f308
parent6723afaa7ba23cc4698bfb0e247b9e7209cd2967
parent7371bac96ba0962b79b59994e4e9b9adf4ee17e8
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I65a7c4f0ef8522d7099ba921c310d45045c830e8