From: purigarcia <pgarcia@solidgear.es>
Date: Tue, 28 Jul 2015 08:47:08 +0000 (+0200)
Subject: merge develop
X-Git-Tag: oc-android-1.8~54^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/65fe0be763fbbd29febae4c4c6e3825f887ec937?ds=inline;hp=65fe0be763fbbd29febae4c4c6e3825f887ec937

merge develop
---