From: tobiasKaminsky Date: Fri, 27 Nov 2015 16:48:54 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/upstream/bug_1300' into beta X-Git-Tag: beta-20151128~6 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8187a6e5126867cc859113aeb1677f3dcd9ef96b?ds=inline;hp=--cc Merge remote-tracking branch 'remotes/upstream/bug_1300' into beta --- 8187a6e5126867cc859113aeb1677f3dcd9ef96b