Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Apr 2014 12:21:32 +0000 (14:21 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Apr 2014 12:22:22 +0000 (14:22 +0200)
Conflicts:
tests/auto/unit/qaudioformat/tst_qaudioformat.cpp

Change-Id: I8499473569df9eac8c7069160e42ed477dacad4d


Trivial merge