Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:57:16 +0000 (12:57 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:57:16 +0000 (12:57 +0200)
commit75d5bdc22e218bcf164c315e4a00bc89561aba81
treef151b984a4573771a6370df7c513b6d26e2ac421
parent6d1e5b38dd64143e391203f966208a207dba099f
parent5f2a2e71eea5daa9ec67db1ca6904762f8bf2b49
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5040e8925ebcf73b353abd3b3e91f9603a086c49