From: masensio <masensio@solidgear.es>
Date: Tue, 10 Mar 2015 13:58:21 +0000 (+0100)
Subject: Merge branch 'develop' into accessibility
X-Git-Tag: oc-android-1.7.1_signed^2~17^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c963eb0fad38ec71f511de231bd81deadecc70fb?hp=c963eb0fad38ec71f511de231bd81deadecc70fb

Merge branch 'develop' into accessibility

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
---