From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 3 Feb 2014 08:46:26 +0000 (+0100)
Subject: Merge branch 'share_link__new_share' into share_link__new_share_menu
X-Git-Tag: oc-android-1.5.5~58^2~15^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/59513cd56ddd82118b96df9a5485406338dfb5ea?ds=inline;hp=59513cd56ddd82118b96df9a5485406338dfb5ea

Merge branch 'share_link__new_share' into share_link__new_share_menu
---