Merge remote-tracking branch 'origin/release' into stable v5.2.1
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 6 Jan 2014 10:35:45 +0000 (11:35 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 6 Jan 2014 10:36:35 +0000 (11:36 +0100)
commitf0283f70a343a8d1013fc60902ce1292a4c9c770
treef5c96ede208e0287287674081ffa9cf6c8966f7b
parent7e890df62e1f153323a2d0ea9409b4371784e753
parent46718cc2c6933e1bb02033fb96960e753fc6cec0
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I49876f1e23dc0506d8ff4df5341540fef6095dc2