From: purigarcia <pgarcia@solidgear.es>
Date: Mon, 11 May 2015 06:16:43 +0000 (+0200)
Subject: Merge branch 'develop' into automationTest
X-Git-Tag: oc-android-1.7.2~1^2~32^2~23
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2d95a83959c77a0c4820c6668b439f8e1b0d038a?ds=inline;hp=--cc

Merge branch 'develop' into automationTest
---

2d95a83959c77a0c4820c6668b439f8e1b0d038a