From: masensio Date: Mon, 12 May 2014 10:57:11 +0000 (+0200) Subject: Merge branch 'develop' into refactor_update_filelist_from_database X-Git-Tag: oc-android-1.7.0_signed~309^2~31 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c1eb0ee621d8f1c8ccbe725e021619781c188aed?ds=inline;hp=--cc Merge branch 'develop' into refactor_update_filelist_from_database --- c1eb0ee621d8f1c8ccbe725e021619781c188aed