Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Mar 2013 08:25:28 +0000 (09:25 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Mar 2013 08:25:28 +0000 (09:25 +0100)
commit954bb7b9603e6049ef3b22ddd5fad2b324d937c3
tree9fd3db2fa39826639f51a931c2638143df7c9c67
parent788715e176f2dc4d600a405511519fd61d1ad717
parent403e829f9dd4ad981c589b1f1e943a5bfbb9b1f9
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ifee8e5713e95d516081c4bc911e8f0bb6a169b13