From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 1 Apr 2014 13:17:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/operations_service' into operations_service
X-Git-Tag: oc-android-1.7.0_signed~345^2~14
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e566d041d199b3a91bfcca7cda72160d7d4ddf8e?ds=inline;hp=e566d041d199b3a91bfcca7cda72160d7d4ddf8e

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