Merge branch 'stable' into release
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 20 Feb 2013 18:47:16 +0000 (19:47 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 20 Feb 2013 18:47:27 +0000 (19:47 +0100)
commit067f3ba728f1fd5be47cd0e36c860e292b6e10b7
treec39b89e770d71300d8680984771e826dbdfd6abd
parent1bc407365d3cf61ecbfc7e3136d0b3bd8bc7fcb7
parentc79d19ae9d4feb353236db49381d8c6b9b032a4b
Merge branch 'stable' into release

Change-Id: I7984affa29d2dbfcc78cfa6ac63e0646355c86ec