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)
commitb154fba6ee7e2dfb77ff10e20c20c080758d2a1d
tree14aa488d71262877cfae71d113ee79fd66e3203b
parentc4359ce3931cd2d54f0798d69b538ec98de619c2
parentb6a5c74d2db8991d46cbd4d1e63bb49ac19ffd41
Merge branch 'develop' into accounts_view

Conflicts:
res/values/strings.xml
res/values/strings.xml