From: masensio Date: Fri, 28 Mar 2014 09:39:08 +0000 (+0100) Subject: Merge branch 'develop' into check_server_version X-Git-Tag: oc-android-1.7.0_signed~355^2~3 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3a1258e4712cda6832fd6797b49417f41a753262?ds=inline;hp=--cc Merge branch 'develop' into check_server_version --- 3a1258e4712cda6832fd6797b49417f41a753262