From: masensio <masensio@solidgear.es>
Date: Wed, 2 Sep 2015 11:21:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop
X-Git-Tag: oc-android-1.8~17^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a0707428ff3f82f28261afc1cdc3061b534f47e2?hp=a0707428ff3f82f28261afc1cdc3061b534f47e2

Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop

Conflicts:
	res/layout/file_preview.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
---