From: masensio Date: Mon, 24 Feb 2014 12:37:48 +0000 (+0100) Subject: Merge branch 'develop' into remove_folder_size_info X-Git-Tag: oc-android-1.5.5~32^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c8fc9cfa70774498570ea422144ef432d2ebaa3f?ds=inline Merge branch 'develop' into remove_folder_size_info --- c8fc9cfa70774498570ea422144ef432d2ebaa3f