Merge branch 'develop' into modify_password
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 2 Jul 2013 11:08:27 +0000 (13:08 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 2 Jul 2013 11:08:27 +0000 (13:08 +0200)
commite8239f434aeb23f598080033ec5f15e0b1971f31
tree2892395097fa78ec54dd30c3d08438943b9549fc
parent7c1be6db3e321891b721c23b2714616700a951c1
parent856038af0d2b8c5e19bee706a53f5010467a55a5
Merge branch 'develop' into modify_password
res/values/strings.xml
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/ui/activity/AccountSelectActivity.java