From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 24 Oct 2014 16:44:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into
X-Git-Tag: oc-android-1.7.0_signed~126^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ec19a11a385ff21d3e85a94e618d48d8be9ef20d?hp=ec19a11a385ff21d3e85a94e618d48d8be9ef20d

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

Conflicts:
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
---