Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 29 Apr 2013 12:17:52 +0000 (14:17 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 29 Apr 2013 12:17:52 +0000 (14:17 +0200)
commit8ccafa889c968112b197894c29956716aebcfc15
treee8609342531cdda3b447669170fbf3c7cea49f06
parentc97b603fa2274f807ce2d6374e965dbc93641c91
parentc85662167123b433a69a662212c67ce03e44a25a
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I9e5ddd0fa7d872c414a8b3010681eaf0e0e16640