From: masensio <masensio@solidgear.es>
Date: Wed, 5 Aug 2015 14:48:12 +0000 (+0200)
Subject: Merge commit 'refs/pr/707' into text_file_preview_pr_707_with
X-Git-Tag: oc-android-1.8~17^2~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b694fee63d7bdb8b93e9d46d28303eff094923fe?hp=b694fee63d7bdb8b93e9d46d28303eff094923fe

Merge commit 'refs/pr/707' into text_file_preview_pr_707_with

Conflicts:
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
---