From: masensio <masensio@solidgear.es>
Date: Fri, 4 Sep 2015 12:31:10 +0000 (+0200)
Subject: Merge branch 'master' into text_file_preview_pr_707_with_develop
X-Git-Tag: oc-android-1.8~17^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fc5c4d899c1e51af26ee1d0c5818c4580386181c?hp=fc5c4d899c1e51af26ee1d0c5818c4580386181c

Merge branch 'master' into text_file_preview_pr_707_with_develop

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