Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:08:17 +0000 (16:08 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:08:17 +0000 (16:08 +0100)
commit4fc75135019ac6b57203ea76f6f4f16e73c74850
treeef88356333b7b34d5a2e108f35f16880c4a085f7
parent44ce9832ae33a9fb8e4a87b0b9e1972b5ef60439
parent5cfb1a915c3a414e835dd5dc5b879ff7fdd54f28
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I8d55441489d74fdf75f140efcb6e09f77ada2082