From: jabarros <jabarros@solidgear.es>
Date: Thu, 23 Oct 2014 09:06:05 +0000 (+0200)
Subject: Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting... 
X-Git-Tag: oc-android-1.7.0_signed~134^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6970560d2fc9272a13c478d48c2d5a578ca7d969?ds=inline;hp=6970560d2fc9272a13c478d48c2d5a578ca7d969

Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files_2

Conflicts:
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
---