Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 30 Sep 2013 21:09:59 +0000 (23:09 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 30 Sep 2013 21:09:59 +0000 (23:09 +0200)
commit5e83f0927c94a0c7244886d308fc0eac133b9ea3
treeedda90d1a77becb1af7916ee61e472e9ae6ee9af
parent271f5aa2df673fb5b353230b6e64e42002ace660
parent329d9d4563445d785284a02983e237ff1a07f5dd
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ia74aa63894bcbe2641590f18e8171d0c677ece12