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)
commitbad9f3011590d2f6b634833e3ef9e78a8fa0a96e
tree40d7d979a5ea87e61696d1fd3e4bd5dd26812fe6
parentdfb2dc0a32d3873b6cf4469b2ad2251676544357
parent44c0d86ede0e79f42528ee60445dea1493bb0e16
Merge branch 'release-1.6.2'