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

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

Conflicts:
	owncloud-android-library
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
---