From: masensio <masensio@solidgear.es>
Date: Thu, 3 Apr 2014 15:00:02 +0000 (+0200)
Subject: Merge branch 'develop' into operations_service
X-Git-Tag: oc-android-1.7.0_signed~345^2~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b017073e960ad2039a823740b5f1ca1771d23278?ds=inline;hp=b017073e960ad2039a823740b5f1ca1771d23278

Merge branch 'develop' into operations_service
---