From: masensio Date: Fri, 9 May 2014 06:21:48 +0000 (+0200) Subject: Merge branch 'develop' into refactor_update_filelist_from_database X-Git-Tag: oc-android-1.7.0_signed~309^2~38 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fdf6a1f3ce51d6ae6ae6e12a46ab8719d650baca?ds=inline;hp=--cc Merge branch 'develop' into refactor_update_filelist_from_database --- fdf6a1f3ce51d6ae6ae6e12a46ab8719d650baca