Merge branch 'develop' into release-1.6.0
authorjabarros <jabarros@solidgear.es>
Thu, 2 Oct 2014 07:04:11 +0000 (09:04 +0200)
committerjabarros <jabarros@solidgear.es>
Thu, 2 Oct 2014 07:04:11 +0000 (09:04 +0200)
1  2 
res/values/strings.xml

Simple merge