From: purigarcia <pgarcia@solidgear.es>
Date: Thu, 14 May 2015 08:18:12 +0000 (+0200)
Subject: Merge branch 'develop' into automationTest
X-Git-Tag: oc-android-1.7.2~1^2~32^2~17
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c775fa0691cb6f5e88694243c61eb10000daa404?hp=-c

Merge branch 'develop' into automationTest
---

c775fa0691cb6f5e88694243c61eb10000daa404