From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 28 Apr 2015 12:20:17 +0000 (+0200)
Subject: Merge branch 'develop' into pinEnhancement
X-Git-Tag: test~19^2~18
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/802a1646160051a507853ef09e680139833fb142?ds=inline;hp=802a1646160051a507853ef09e680139833fb142

Merge branch 'develop' into pinEnhancement

Conflicts SOLVED:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/activity/Uploader.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
---