From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 25 Apr 2013 17:39:22 +0000 (+0200)
Subject: Merge branch 'develop' into oauth_login
X-Git-Tag: oc-android-1.4.3~29^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2946d8dd69cf8d30a3fc2447ac931675989e8eff?ds=inline;hp=2946d8dd69cf8d30a3fc2447ac931675989e8eff

Merge branch 'develop' into oauth_login

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/owncloud/android/Uploader.java
	src/com/owncloud/android/authentication/AccountAuthenticator.java
	src/com/owncloud/android/authenticator/AuthenticationRunnable.java
	src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
	src/com/owncloud/android/authenticator/OnConnectCheckListener.java
	src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/FileOperation.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/network/OwnCloudClientUtils.java
	src/com/owncloud/android/operations/RemoteOperationResult.java
	src/com/owncloud/android/operations/UpdateOCVersionOperation.java
	src/com/owncloud/android/syncadapter/FileSyncAdapter.java
	src/com/owncloud/android/ui/activity/AccountSelectActivity.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/eu/alefzero/webdav/WebdavClient.java
---