Merge with develop
authorMagnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Mon, 20 Oct 2014 12:38:13 +0000 (14:38 +0200)
committerMagnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Mon, 20 Oct 2014 12:38:13 +0000 (14:38 +0200)
commit844790057b6519bc6e90f49c139335a97aade4c8
treeaf21150272bb6db6c71cfdef1c5fd2a3ab7981b1
parentb6c7719415ce87d905996a4def50066415786c3e
parent6ed394195d05b5b36c93ac8f112ff0dd50693af8
Merge with develop
res/values/strings.xml
res/xml/preferences.xml
src/com/owncloud/android/ui/activity/Preferences.java