From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 18 Jan 2015 16:00:29 +0000 (+0100)
Subject: Merge branch 'develop2' into imageGrid2
X-Git-Tag: oc-android-1.7.0_signed~16^2~21
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6d5c6f86e5fa9a2edb51562d028554cbc49cdf93?ds=inline;hp=6d5c6f86e5fa9a2edb51562d028554cbc49cdf93

Merge branch 'develop2' into imageGrid2

Conflicts:
	owncloud-android-library
	res/layout/list_fragment.xml
	res/values-fr/strings.xml
	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
---