From: purigarcia <pgarcia@solidgear.es>
Date: Fri, 10 Jul 2015 06:46:48 +0000 (+0200)
Subject: Merge branch 'develop' into fix_send
X-Git-Tag: oc-android-1.8~54^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4d9146fa2af5d19ff8cb13a2b7eb11c37a5c88ba?ds=inline;hp=-c

Merge branch 'develop' into fix_send
---

4d9146fa2af5d19ff8cb13a2b7eb11c37a5c88ba