From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 5 Nov 2014 21:07:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into imageGrid
X-Git-Tag: oc-android-1.7.0_signed~16^2~28
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f331120a147b95e7a27fb765de2e210d4af892ca?hp=f331120a147b95e7a27fb765de2e210d4af892ca

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

Conflicts:
	owncloud-android-library
	res/layout/list_item.xml
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
---