From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 3 Apr 2014 09:27:44 +0000 (+0200)
Subject: Merge branch 'develop' into operations_service
X-Git-Tag: oc-android-1.7.0_signed~345^2~8^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5611205f1d5bc06bc89a73ac27f70098a09bd9ae?hp=5611205f1d5bc06bc89a73ac27f70098a09bd9ae

Merge branch 'develop' into operations_service
---