From: jabarros <jabarros@solidgear.es>
Date: Thu, 9 Oct 2014 15:26:02 +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~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7d9fc6857e1d534c1930b94b6063f1e21a827e9b?hp=7d9fc6857e1d534c1930b94b6063f1e21a827e9b

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

Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
---