From: jabarros <jabarros@solidgear.es>
Date: Mon, 27 Oct 2014 14:12:48 +0000 (+0100)
Subject: Merge branch 'develop' into thumbnails_from_server
X-Git-Tag: oc-android-1.7.0_signed~121^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/dcb985481be4b3c4e4e805b4aefebae00f9ad3e9?hp=dcb985481be4b3c4e4e805b4aefebae00f9ad3e9

Merge branch 'develop' into thumbnails_from_server

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
---