From: masensio <masensio@solidgear.es>
Date: Mon, 7 Apr 2014 06:49:01 +0000 (+0200)
Subject: Merge branch 'develop' into operations_service
X-Git-Tag: oc-android-1.7.0_signed~345^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/af45cabf35fd1f8fa48038930a0a59d0ad121037

Merge branch 'develop' into operations_service
---

af45cabf35fd1f8fa48038930a0a59d0ad121037