Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 23 May 2013 11:15:30 +0000 (13:15 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 23 May 2013 11:15:30 +0000 (13:15 +0200)
commit007a1b71fb922efddff6a8f4ff81311f2fed622d
tree663fdca23f56a041dd3c8f81bd4890414d964333
parenteec0eaed067dc1b421e12530c70b3a4ee01affee
parent5be73820b872dfed6a31a43a7876755450a438b6
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I4556ce5965020154a563cef9613305cafae3c674