From: masensio <masensio@solidgear.es>
Date: Wed, 19 Mar 2014 16:17:55 +0000 (+0100)
Subject: Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
X-Git-Tag: oc-android-1.5.5~5^2~3^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/738ea33c060fdf1ebc30ae8cc952229bc59da979?hp=-c

Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
---

738ea33c060fdf1ebc30ae8cc952229bc59da979