Merge branch 'dev' of git://gitorious.org/qt/qtdeclarative into wip/v4
authorLars Knoll <lars.knoll@digia.com>
Fri, 9 Aug 2013 11:59:22 +0000 (13:59 +0200)
committerLars Knoll <lars.knoll@digia.com>
Fri, 9 Aug 2013 11:59:57 +0000 (13:59 +0200)
commit65d31326af13ffecd3810459a8bd6db186ea1587
tree7025cc9646c50df3f5fa35af37b4014da4fde841
parentf3cbd0b8aa96abfc4b3660df4426ed10b11b18e0
parent84a4d5d9fe57af1091c4c36eabf8a674d7140bac
Merge branch 'dev' of git://gitorious.org/qt/qtdeclarative into wip/v4

Change-Id: Iaf5c134e8c6fa27ef17dcf85d8bd5ccd896c7b9d