From: masensio <masensio@solidgear.es>
Date: Tue, 5 May 2015 11:56:57 +0000 (+0200)
Subject: Merge branch 'develop' into pinEnhancement
X-Git-Tag: test~19^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7d82231809c5073a598e6aab8c582bac63ecbf53

Merge branch 'develop' into pinEnhancement
---

7d82231809c5073a598e6aab8c582bac63ecbf53