Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 23 Dec 2013 14:37:57 +0000 (15:37 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 23 Dec 2013 14:37:57 +0000 (15:37 +0100)
commitb8ff3917810332ac60de1294331dfe28d2d872e2
tree29057cdf312874cdcc5ddcdaafe866bf77b7d5a8
parentdd7fd6f8760f14081648860715fb320cbc3bb7dd
parenta038352dc05a880eec6b94b5ba4e01673b1565ca
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I31a326945d624b10d5c87703d0e2b8ac723a05ab