From: masensio <masensio@solidgear.es>
Date: Thu, 27 Mar 2014 09:05:59 +0000 (+0100)
Subject: Merge branch 'develop' into check_server_version
X-Git-Tag: oc-android-1.7.0_signed~355^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/66bca2934dae32573aaa48a939ad4d1426f21309?ds=inline;hp=--cc

Merge branch 'develop' into check_server_version
---

66bca2934dae32573aaa48a939ad4d1426f21309