From: masensio <masensio@solidgear.es>
Date: Fri, 4 Apr 2014 12:50:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/operations_service' into operations_service
X-Git-Tag: oc-android-1.7.0_signed~345^2~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c1df34b5e38a671c7cd57aa223a5251812e84824?hp=-c

Merge remote-tracking branch 'origin/operations_service' into operations_service
---

c1df34b5e38a671c7cd57aa223a5251812e84824