From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 3 May 2013 12:25:02 +0000 (+0200)
Subject: Merge branch 'develop' into fixForCrashedSharedContents
X-Git-Tag: oc-android-1.4.3~28^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/65f403bf994bd84d64eea16072b7bec479c0d525?hp=65f403bf994bd84d64eea16072b7bec479c0d525

Merge branch 'develop' into fixForCrashedSharedContents

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