Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 18 Feb 2013 15:09:29 +0000 (16:09 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 18 Feb 2013 15:09:29 +0000 (16:09 +0100)
commitd3ec09c1c0b6079335136e25f7957ea75ec4e76c
tree3063b7815c56ed5db187967c45b53ec0f19b3650
parent6afde37f3e3dfe707dcaf81994d34e94f74d9537
parent98cbd8ba0b1b91206ddd9cbf88ed4fc255e9aeb8
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Icc911c4f334091c0e1ece149ac68fab25ca07bd0