From: masensio <masensio@solidgear.es>
Date: Mon, 27 Jan 2014 13:00:07 +0000 (+0100)
Subject: Merge branch 'develop' into share_link_show_shared_files
X-Git-Tag: oc-android-1.5.5~35^2~47
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/388fdd2265b24b78808d1e51a994cc543d2a43c8?hp=388fdd2265b24b78808d1e51a994cc543d2a43c8

Merge branch 'develop' into share_link_show_shared_files
---