Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 23 Jul 2013 09:15:57 +0000 (11:15 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 23 Jul 2013 09:15:57 +0000 (11:15 +0200)
commit9d7c087624b3c9b54c7a3113c6a19dd6f2faad02
tree17262709c981a7c9e7a4d39d503d369bc7bd402d
parent51bfca71778781f993a02445c6ee1493be1e5528
parent1d62c270dd4d44e640d2f7646ddc5dbf04e7825d
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5368a3b3212af59ac5b95bc56c667b0d3392078a