Merge branch 'share_link__new_share' into share_link__unshare_file

author masensio <masensio@solidgear.es>

Thu, 6 Feb 2014 10:23:30 +0000 (11:23 +0100)

committer masensio <masensio@solidgear.es>

Thu, 6 Feb 2014 10:23:30 +0000 (11:23 +0100)
author masensio <masensio@solidgear.es>
Thu, 6 Feb 2014 10:23:30 +0000 (11:23 +0100)
committer masensio <masensio@solidgear.es>
Thu, 6 Feb 2014 10:23:30 +0000 (11:23 +0100)
diff --cc owncloud-android-library

index f166bcd,d96e31b..e9a1ee8
--- 1/owncloud-android-library
--- 2/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit f166bcdd8b52a64c3ad0c8725ed64ba768c1eeb5
- -Subproject commit d96e31b5e595518dc6365e5b290dba124140dc26
++Subproject commit e9a1ee81ca37182963467f85476de0fbc216d2e7
author	masensio <masensio@solidgear.es>
	Thu, 6 Feb 2014 10:23:30 +0000 (11:23 +0100)
committer	masensio <masensio@solidgear.es>
	Thu, 6 Feb 2014 10:23:30 +0000 (11:23 +0100)