Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:56:07 +0000 (12:56 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:56:07 +0000 (12:56 +0200)
commit36c12107171a57f1483602730fe797e5ed2ea5d6
tree4b5ceaedf53bb9077478dd4a67374a084f43d6c7
parent2fd2b4b9b6a5a12e936043023d7f52edd643df91
parent916bf33706a43a9a3451623fbd44f2f43cdd401e
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I150f544a868db3712d78439af53924e90d29a39d