Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 5 Dec 2013 17:46:27 +0000 (18:46 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 5 Dec 2013 17:46:27 +0000 (18:46 +0100)
commita637203b75706843d6a36e747ddeb2d1cce32a48
treedd4bd23e1f50a8b013f754bb0cfa077f8620c38e
parent4fc75135019ac6b57203ea76f6f4f16e73c74850
parent1e71b35d9775b0abc9de0ce051bff400f0f1ba64
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Idd4115a252a1bde50b6f47ec9eba8710dec0d5fb