Merge branch 'release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 10 Apr 2013 18:23:26 +0000 (20:23 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 10 Apr 2013 18:23:56 +0000 (20:23 +0200)
commit8cdee97ee1c7a4900fd32dc6e5ed7670f2c8c939
treeff12689d9164b23391cf827f539847c08e56c6f1
parenta2cd7f79031ed14b98420ede645376fe71182a1c
parentbacb0bec3cc2b409b215093f8e6ea3ff00c2af45
Merge branch 'release' into stable

Change-Id: I1937fdd293d96a6926749f800bcbccca7a73486d