From: jabarros <jabarros@solidgear.es>
Date: Thu, 23 Oct 2014 08:18:20 +0000 (+0200)
Subject: Merge branch 'develop' into sorting_files_2
X-Git-Tag: oc-android-1.7.0_signed~134^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2fad1e1a996c1f6058445ca398a74743b0e93023?hp=2fad1e1a996c1f6058445ca398a74743b0e93023

Merge branch 'develop' into sorting_files_2

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