Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 4 Jan 2013 12:22:16 +0000 (13:22 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 4 Jan 2013 12:24:12 +0000 (13:24 +0100)
commitec316b3b7973efa3f2d2af211b95bc8b45b42a50
treeb3f0445661ccddb4d11a6a90cf944400205edfd8
parentc2736c3a629d944818c44db9ad69beffb872bdd5
parent6902c5d770bfa79522d4349215c0b582642c7594
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
sync.profile

Change-Id: I450b86e3d01498aca12fe11a28527a296f2cbc3f