Merge branch 'stable' into release
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:16:24 +0000 (09:16 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:16:51 +0000 (09:16 +0100)
commit7830710e57cbbbc8a2fb37fc97eb99f552ecdd83
tree3fe141b7921ec3820c1db13fe1827c051e8f5060
parent0beb478b7f4c50f6b57cdc164ffe8029d2895149
parentd37547add0369d45182271754c0a35032d7de2d3
Merge branch 'stable' into release

Change-Id: I44631ce9d9a6aba090d01911ff62b56043510c9c