From: masensio <masensio@solidgear.es>
Date: Tue, 7 Apr 2015 13:12:44 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into develop
X-Git-Tag: test~39
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/05caa7dab2bd37285287fb02efb2651e216675bf

Merge remote-tracking branch 'origin/develop' into develop
---

05caa7dab2bd37285287fb02efb2651e216675bf