Merge branch 'release' into stable v5.1.0-beta1
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 10 Apr 2013 18:28:00 +0000 (20:28 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 10 Apr 2013 18:28:20 +0000 (20:28 +0200)
commit1a0366fd16beb8677ef4535267fd19120402651f
tree82c1e630548f80a7815213e3728a1cf59fb8ea3f
parent4e896d9ed32af523e8fb951409bf3cc21b4d5718
parent438b596f3e42f186017940b185116d8c36bece53
Merge branch 'release' into stable

Change-Id: Ia071dc309030c484ce0571ba6ee0d7baaee87b36