From: purigarcia <pgarcia@solidgear.es>
Date: Wed, 25 Mar 2015 12:20:58 +0000 (+0100)
Subject: Merge branch 'develop' into automationTest
X-Git-Tag: oc-android-1.7.2~1^2~32^2~31
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/cefcf53e9e34e6b4de0449a6c24fb1872a42258f?ds=inline

Merge branch 'develop' into automationTest
---

cefcf53e9e34e6b4de0449a6c24fb1872a42258f