Merge branch 'develop' into oc_framework_cleanup_and_documentation

author David A. Velasco <dvelasco@solidgear.es>

Mon, 20 Jan 2014 08:24:44 +0000 (09:24 +0100)

committer David A. Velasco <dvelasco@solidgear.es>

Mon, 20 Jan 2014 08:24:44 +0000 (09:24 +0100)
author David A. Velasco <dvelasco@solidgear.es>
Mon, 20 Jan 2014 08:24:44 +0000 (09:24 +0100)
committer David A. Velasco <dvelasco@solidgear.es>
Mon, 20 Jan 2014 08:24:44 +0000 (09:24 +0100)
diff --cc oc_framework/src/com/owncloud/android/oc_framework/accounts/AccountUtils.java
Simple merge
diff --cc oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java
Simple merge
author	David A. Velasco <dvelasco@solidgear.es>
	Mon, 20 Jan 2014 08:24:44 +0000 (09:24 +0100)
committer	David A. Velasco <dvelasco@solidgear.es>
	Mon, 20 Jan 2014 08:24:44 +0000 (09:24 +0100)
		1	2
oc_framework/src/com/owncloud/android/oc_framework/accounts/AccountUtils.java	patch \|	diff1 \|	diff2 \|	blob \| history
oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java	patch \|	diff1 \|	diff2 \|	blob \| history