From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 3 Dec 2014 10:31:49 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.7.0_signed~89
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/50e39f044f0ac1bbd572ba9eb8178a415791a8a5?hp=50e39f044f0ac1bbd572ba9eb8178a415791a8a5

Merge branch 'master' into develop
---