Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 24 Mar 2014 15:08:26 +0000 (16:08 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 24 Mar 2014 15:08:26 +0000 (16:08 +0100)
commit4daf3a59c8815ac1fb9df5da8df84ebf0e54ab9d
treee52c0c834d9aba8ba85fba78b5897c3b7dac2051
parent31c494144e986d490dfe342aed3cacfddcc555bd
parent2b831378c34426614781d2a4f0661f7f4c94762c
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ied78d78d873976c35a1aa51efb154b355950cf91