Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Apr 2014 12:17:49 +0000 (14:17 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Apr 2014 12:17:49 +0000 (14:17 +0200)
commitf78a7049271e59238acfcad58fb4f7183d92cd1f
treeb87d1bf5a7a16a126a5d07e629aae591e1d27e4f
parent258d019df60bc346a6fa89da694e52c4743dc18b
parent8b9836d0e00736b5a16f650667218612940e106b
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iff68a7da2065b64579032f1be8eaf5fb097d58bb