From: purigarcia <pgarcia@solidgear.es>
Date: Mon, 4 May 2015 07:10:45 +0000 (+0200)
Subject: Merge branch 'develop' into automationTest
X-Git-Tag: oc-android-1.7.2~1^2~32^2~25
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/606834980cea8cd1a743d7455174ae0be76eb630?hp=--cc

Merge branch 'develop' into automationTest
---

606834980cea8cd1a743d7455174ae0be76eb630