Merge branch 'master' into dev_ci
authorTony Sarajärvi <tony.sarajarvi@digia.com>
Tue, 4 Feb 2014 13:20:21 +0000 (15:20 +0200)
committerTony Sarajärvi <tony.sarajarvi@digia.com>
Tue, 4 Feb 2014 13:20:21 +0000 (15:20 +0200)
commitfbeb29700a13266f8c7fc3a211a7071dcbd3a84d
tree03ed7f011f931f2e53fb661ca8b28734672285d0
parentbd73776791d086a0c57750b5e8256f551e7612a9
parent3b7692b2f1f791a2ab3da01076f33945dd71503e
Merge branch 'master' into dev_ci

Conflicts:
scripts/qt/qtmod_test.pl
scripts/jenkins/qt-jenkins-deploy.pl
scripts/jenkins/qt-jenkins-integrator.pl
scripts/qt/qtmod_test.pl