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

Merge branch 'develop' into favourites_context_menu
---

a3bfcdcd85ad864036281762471e732d54c17586