Merge branch 'develop' into accessibility
authormasensio <masensio@solidgear.es>
Tue, 10 Mar 2015 13:58:21 +0000 (14:58 +0100)
committermasensio <masensio@solidgear.es>
Tue, 10 Mar 2015 13:58:21 +0000 (14:58 +0100)
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java


No differences found