From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 4 Apr 2013 14:44:30 +0000 (+0200)
Subject: Merge branch 'develop' into feature_previews
X-Git-Tag: oc-android-1.4.3~39^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/77ddd1ccb62e8b70580b8f410dda703a269f224f?hp=77ddd1ccb62e8b70580b8f410dda703a269f224f

Merge branch 'develop' into feature_previews

Conflicts:
	AndroidManifest.xml
	res/menu/file_context_menu.xml
	res/menu/menu.xml
	res/values-de-rDE/strings.xml
	res/values/strings.xml
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
---