Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:56:43 +0000 (12:56 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:56:43 +0000 (12:56 +0200)
commit9b5cc9e6082366cbe6e76c29d493448ef496b43e
tree320e5e874eb1e642b4f1d9985f9deedb29fb6779
parentcd91a949bb7554595e864215b52c29c1558dc958
parent925f1264c590c12aaa5f93a687c7b2aba4370115
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5b59732e2ff9df6bd674fd0e3fba058d0e5d51f9