Merge remote-tracking branch 'origin/5.4.0' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 17 Dec 2014 11:59:05 +0000 (12:59 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 17 Dec 2014 11:59:05 +0000 (12:59 +0100)
commita864bfa4129f27f744ad223bbd14460afc049670
tree9fc0ff7be5ad38dc1d0ba77bec60f22a2161bd1b
parentcb0fb37b10589da0f7fbc2b0ed705ee8c77a1f1f
parent8b1ee1724071cc4bbe8cefe195e375ef583d9d7f
Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: Ice62a75ba6ff094e22e8affbecf26f4d3bf2f282