From: purigarcia <pgarcia@solidgear.es>
Date: Fri, 29 May 2015 12:17:52 +0000 (+0200)
Subject: Merge branch 'develop' into automationTest
X-Git-Tag: oc-android-1.7.2~1^2~32^2~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/916bd5c6ca02dde2916732a826814377e495dcfe

Merge branch 'develop' into automationTest
---

916bd5c6ca02dde2916732a826814377e495dcfe