Merge branch 'release-1.6.2' oc-android-1.6.2
authorjabarros <jabarros@solidgear.es>
Wed, 3 Dec 2014 08:33:07 +0000 (09:33 +0100)
committerjabarros <jabarros@solidgear.es>
Wed, 3 Dec 2014 08:33:07 +0000 (09:33 +0100)

Trivial merge