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)
commit2e472998c16e504c0c2ceddf7de52a000d7bd7f8
tree3f28e6455ac17992f756024ca98cc95c87f94d75
parentba798ccda231d4b9354dd7ffc72c01025cc664da
parentb5ae527bff5acfd6faeefcb1851bc9c3a2849c7a
Merge branch 'develop' into release-1.6.0
res/values/strings.xml