Merge branch 'release' into stable old/5.1 v5.1.1
authorSergio Ahumada <sergio.ahumada@digia.com>
Tue, 25 Jun 2013 22:02:43 +0000 (00:02 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Tue, 25 Jun 2013 22:03:22 +0000 (00:03 +0200)
commit94ff4dbe6f56360aec737532ec17ab0fdfb7be2b
treea2fded55c743dfe342b2c45f9a4f6406732b8c19
parent252f9312200af2bfef1c7f17a2091b2580a05ead
parenteb8ee6a96b8a3dd4228c746c617dd36b66e70dec
Merge branch 'release' into stable

Change-Id: I07228275ddc3cb515d11eca4b3f5ea4671c9edc4