From: Jorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Date: Wed, 3 Dec 2014 14:08:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into us4_view_text_files
X-Git-Tag: oc-android-1.8~17^2~8^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/49e8dafac05eef53cabbff8f3efbe312b8d5b80b?hp=49e8dafac05eef53cabbff8f3efbe312b8d5b80b

Merge remote-tracking branch 'upstream/develop' into us4_view_text_files

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