Merge branch 'release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 15:21:09 +0000 (16:21 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 15:21:22 +0000 (16:21 +0100)
commit9f90314a1e7a0f8d975716a6878e1e7abd5ad945
treee018cc5614a79b32a27e890b38a1a84f325dfa07
parent2bddbd5299c8b788c1f77ff65d0c744122af59e5
parent1bc407365d3cf61ecbfc7e3136d0b3bd8bc7fcb7
Merge branch 'release' into stable

Change-Id: I36ba2436d653e88a03fcb1e04658e50f8ad8392e