From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 8 Jan 2015 21:41:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into uploadNewFolder
X-Git-Tag: oc-android-1.7.1_signed^2~9^2~10^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d54345d0403a4ea2214b793b24ba0e821ea1339c?hp=d54345d0403a4ea2214b793b24ba0e821ea1339c

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

Conflicts:
	src/com/owncloud/android/ui/activity/Uploader.java
---