From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 24 Oct 2014 16:18:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into fileCount
X-Git-Tag: oc-android-1.7.0_signed~91^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fbc3d970c565e16898eb019d7aef716521a40f10?ds=sidebyside;hp=fbc3d970c565e16898eb019d7aef716521a40f10

Merge remote-tracking branch 'upstream/develop' into fileCount

Conflicts:
	res/layout/list_fragment.xml
	res/values/strings.xml
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
---