From: masensio <masensio@solidgear.es>
Date: Tue, 27 Oct 2015 07:52:17 +0000 (+0100)
Subject: Merge branch 'master' into sync_full_folder
X-Git-Tag: oc-android-1.9^2~37^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b9ef747a0be9e50d50b709474daf9dca47d60f5f?ds=sidebyside;hp=b9ef747a0be9e50d50b709474daf9dca47d60f5f

Merge branch 'master' into sync_full_folder

Conflicts:
	owncloud-android-library
	src/com/owncloud/android/files/services/FileUploader.java
---