From: purigarcia <pgarcia@solidgear.es>
Date: Wed, 6 May 2015 17:05:03 +0000 (+0200)
Subject: Merge branch 'develop' into automationTest
X-Git-Tag: oc-android-1.7.2~1^2~32^2~24
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6a9dfdb3300a6faaf00889f4e919ef92262096de?ds=inline;hp=--cc

Merge branch 'develop' into automationTest
---

6a9dfdb3300a6faaf00889f4e919ef92262096de