Merge branch 'stable' into release
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:38:38 +0000 (09:38 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:38:47 +0000 (09:38 +0100)
commitaed7aa451f582a772368b80506c7e26c3e8c18a2
tree06632103e243f5d2ec5044f3d4d5afd0a119634f
parentd140f99fa3052c8957b9247d9c6f9bf47c6c2a92
parent722725cf24e45e86a2844810b90787a29df8a4a9
Merge branch 'stable' into release

Change-Id: I1f4521205b6bb3811294fd2c32df4b4bce97d147