Merge branch 'develop' into accounts_view
authorjabarros <jabarros@solidgear.es>
Thu, 7 Aug 2014 15:34:15 +0000 (17:34 +0200)
committerjabarros <jabarros@solidgear.es>
Thu, 7 Aug 2014 15:34:15 +0000 (17:34 +0200)
Conflicts:
res/values/strings.xml


No differences found