From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 5 May 2015 11:43:01 +0000 (+0200)
Subject: Merge branch 'develop' into pinEnhancement
X-Git-Tag: test~19^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/dcd8dde86400e2d36a25141b3ce3dfdb49965033

Merge branch 'develop' into pinEnhancement
---

dcd8dde86400e2d36a25141b3ce3dfdb49965033