Merge branch 'release-1.9' into stable oc-android-1.9
authormasensio <masensio@solidgear.es>
Thu, 3 Dec 2015 08:25:06 +0000 (09:25 +0100)
committermasensio <masensio@solidgear.es>
Thu, 3 Dec 2015 08:25:06 +0000 (09:25 +0100)
commit0794871f881860364b787278a1fec85cf4ed3569
treed2676b8778bb85aacbbf95248b7cde02e2d6718a
parent4bd4cd24b4fc4b7c6610646498abb5b0389492d4
parent49f593ecd148ef5e5bd64dcb2d8bcc7e394e6ef2
Merge branch 'release-1.9' into stable