From: masensio <masensio@solidgear.es>
Date: Wed, 5 Feb 2014 07:50:19 +0000 (+0100)
Subject: Merge branch 'develop' into share_link__new_share
X-Git-Tag: oc-android-1.5.5~58^2~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d770f62ed80c3e5e5987a6d1d3c40944a500e4dc?ds=inline;hp=--cc

Merge branch 'develop' into share_link__new_share
---

d770f62ed80c3e5e5987a6d1d3c40944a500e4dc