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