From: purigarcia <pgarcia@solidgear.es>
Date: Thu, 16 Apr 2015 07:10:59 +0000 (+0200)
Subject: Merge branch 'develop' into automationTest
X-Git-Tag: oc-android-1.7.2~1^2~32^2~26
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/68b9744a9c99f38d35a7b146cde4f4deceee68b7

Merge branch 'develop' into automationTest
---

68b9744a9c99f38d35a7b146cde4f4deceee68b7