Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 23 May 2013 11:14:58 +0000 (13:14 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 23 May 2013 11:14:58 +0000 (13:14 +0200)
commitbb7c0257bfe3ab1478c74365476f5da72489cd2e
treec39f18b32727871a3aa690f55fc3a04b98e20f2a
parentfb3ba4375fd9d28806258e35c9f1ffc06610ae7d
parentd4ff8be3c23fe40cc5aaa4dd435376cd1b6f185a
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I4083f690818459b5d53fa025413bfb321e12e7c6