From: masensio Date: Tue, 1 Apr 2014 12:18:32 +0000 (+0200) Subject: Merge branch 'develop' into operations_service X-Git-Tag: oc-android-1.7.0_signed~345^2~14^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5ac1a1ebbb78aaa7b85318bd7542b1c047291d19 Merge branch 'develop' into operations_service --- 5ac1a1ebbb78aaa7b85318bd7542b1c047291d19