Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:13:11 +0000 (23:13 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:13:11 +0000 (23:13 +0200)
commit6723afaa7ba23cc4698bfb0e247b9e7209cd2967
tree6adb4e80c2233f26c692b26352abf1c8093ded14
parentf85f58cabbb9166790359a2a5b36974607fa0b74
parent35e1b7dd8fef475a6bf7daf4067bae08dd635c11
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I9fa5695799a21d0938fe35dfec5351b99f8232b9