From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 1 Sep 2015 16:35:51 +0000 (+0200)
Subject: Merge branch 'master' into copy
X-Git-Tag: oc-android-1.8~22^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e6be60679fd7bc781dbd7a2a2b82d58eb720b746?hp=e6be60679fd7bc781dbd7a2a2b82d58eb720b746

Merge branch 'master' into copy

Conflicts FIXED:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/com/owncloud/android/ui/preview/FileDownloadFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
	src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
---