Merge remote-tracking branch 'origin/5.4' into 5.4.0
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 10 Nov 2014 10:42:05 +0000 (11:42 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 10 Nov 2014 10:50:11 +0000 (11:50 +0100)
commitfa520d0c86b69d4ff794df51ff498956a477127c
tree27f0d155ef70473d8b9574e734208317032afcf3
parent3d389f2a47dad538925ca1916e889c4bbc48fbac
parent868def84fe800aaba937159814388249ebbaf914
Merge remote-tracking branch 'origin/5.4' into 5.4.0

Change-Id: I2c69deb3bc69da1a06485aaf72fb298b08756734