Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 17:14:46 +0000 (19:14 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 17:14:46 +0000 (19:14 +0200)
Change-Id: I045587eac266e9b6296d9cd9e3c73031fe18bbd1

1  2 
src/qml/qml/qqmlxmlhttprequest.cpp

Simple merge