Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 5 Jun 2013 13:10:58 +0000 (15:10 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 5 Jun 2013 13:46:54 +0000 (15:46 +0200)
commit75c8ae12a30d622de464554c3c1da96afbed9590
treeefe55c755248315eb4b91300f8c3f972da7aa115
parentd34a135a5772ab208745aa3490d95d1302e366ac
parent7a6bf3ed5c5338dca085c3979edc8ec8f51c7980
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev