From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 18 Mar 2013 13:28:49 +0000 (+0100)
Subject: Merge tag 'oc-android-1-3-22' into oauth_login
X-Git-Tag: oc-android-1.4.3~29^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5665d9c306165c144fc60b9749ac184cb32369c0?ds=inline;hp=5665d9c306165c144fc60b9749ac184cb32369c0

Merge tag 'oc-android-1-3-22' into oauth_login

Conflicts:
	AndroidManifest.xml
	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/services/FileOperation.java
	src/com/owncloud/android/files/services/InstantUploadService.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
---