From: masensio Date: Tue, 18 Mar 2014 11:52:24 +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~7 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d9da1e9ba3b9219aa9243d69790964e078db7434?ds=inline;hp=--cc Merge branch 'develop' into share_link__reuse_link_shared_in_server --- d9da1e9ba3b9219aa9243d69790964e078db7434