From: masensio <masensio@solidgear.es>
Date: Thu, 19 Feb 2015 11:54:59 +0000 (+0100)
Subject: Merge branch 'develop' into cancel_transfer_for_deleted_users
X-Git-Tag: oc-android-1.7.1_signed^2~40^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/cb175f29949dbac17a3870a71ecff60df5c9bdc4?hp=cb175f29949dbac17a3870a71ecff60df5c9bdc4

Merge branch 'develop' into cancel_transfer_for_deleted_users

Conflicts:
	AndroidManifest.xml
---