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

Merge branch 'develop' into automationTest
---

1d613754d64d1c25f37c0242cd940311c340b621