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)
commit8b32e1cb76e24cdcf0b614c39ad702360fd479fb
tree28e52115c70d28bc9fe3e825b06e2c7799780b96
parent7f526c40345a360cd0f5fa5b707c66ec4612bbec
parentcac497e7a45fc901798663006ac7894b7197a549
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I045587eac266e9b6296d9cd9e3c73031fe18bbd1
src/qml/qml/qqmlxmlhttprequest.cpp