From: tobiasKaminsky Date: Sat, 28 Nov 2015 08:49:09 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/upstream/master' into beta X-Git-Tag: beta-20151128~2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a92bfac47912d3639f7ef55015565f8e99b99407?hp=--cc Merge remote-tracking branch 'remotes/upstream/master' into beta --- a92bfac47912d3639f7ef55015565f8e99b99407