Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 12 Aug 2013 10:47:02 +0000 (12:47 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 12 Aug 2013 10:47:02 +0000 (12:47 +0200)
commit74e4b59ec8eeeb22592d90647829d95d5940d827
tree8addf534e10e75d4c68d42e26c7970b915134196
parent06eab796bafa48c9e1a7e6c389bec84b8f42bd49
parent9f484eae83fd81e12aa4f07398ad13f9d453ba92
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
src/plugins/plugins.pro

Change-Id: Ieec8b5984b0fba97872bf96c38410369dc0e20cf
src/plugins/plugins.pro