From: masensio <masensio@solidgear.es>
Date: Mon, 10 Feb 2014 12:48:02 +0000 (+0100)
Subject: Merge branch 'develop' into share_link__unshare_file
X-Git-Tag: oc-android-1.5.5~48^2~17
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/659fda0475d088d947e227ca50fc672632d26363?hp=--cc

Merge branch 'develop' into share_link__unshare_file
---

659fda0475d088d947e227ca50fc672632d26363