From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 22 Jun 2015 09:23:05 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.7.2~1^2~14
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8981be0c716430d58ac00955c6b1db367e60efcd?ds=inline

Merge branch 'master' into develop

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

8981be0c716430d58ac00955c6b1db367e60efcd
diff --cc owncloud-android-library
index 344d5b22,2b2fc917..ff85ff2e
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 344d5b22e43021ebc54f18ad7d17b1702dfa406c
 -Subproject commit 2b2fc9171f2cf2c4701a74e4a564148584aab33a
++Subproject commit ff85ff2eef6d418de75ab587ad9b7489d868a22a