From: masensio Date: Wed, 19 Mar 2014 16:22:31 +0000 (+0100) Subject: Merge branch 'develop' into share_link__reuse_link_shared_in_server X-Git-Tag: oc-android-1.5.5~5^2~6^2~6 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1fb1a3294efd93ae80d49bb3cb3c9516365be2b7?hp=--cc Merge branch 'develop' into share_link__reuse_link_shared_in_server --- 1fb1a3294efd93ae80d49bb3cb3c9516365be2b7