From: purigarcia <pgarcia@solidgear.es>
Date: Fri, 5 Jun 2015 08:32:37 +0000 (+0200)
Subject: Merge branch 'develop' into automationTest
X-Git-Tag: oc-android-1.7.2~1^2~32^2~1^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/23af1d2310d80891d77db01a1f7df90f242702f9?ds=inline;hp=-c

Merge branch 'develop' into automationTest
---

23af1d2310d80891d77db01a1f7df90f242702f9