From: masensio <masensio@solidgear.es>
Date: Thu, 9 Apr 2015 14:57:09 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: test~38
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/558a3af1eb1dcea0c7d1b65c1b85f338563cbcb8?hp=-c

Merge branch 'master' into develop
---

558a3af1eb1dcea0c7d1b65c1b85f338563cbcb8