Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 4 Jul 2013 13:34:01 +0000 (15:34 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 4 Jul 2013 13:34:01 +0000 (15:34 +0200)
commit50aa9da79f8ec06f4c53ce1231021be2000684f8
tree760fccd958af189efc957b8013c76e4681db54e9
parent704d8095d6a85653464dcda25e31f2e0724c131d
parentcc8379cfbbaa0a4e2a04f68712afdb6597cb10f3
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I7d863f4b9921018cd64a56b427bbd3ef36622932