From: tobiasKaminsky Date: Fri, 13 Nov 2015 16:49:03 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/upstream/master' into beta X-Git-Tag: beta-20151122~21 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f707da7cce6e1ad2532cbef720cf28ff3bd39032?ds=inline;hp=--cc Merge remote-tracking branch 'remotes/upstream/master' into beta --- f707da7cce6e1ad2532cbef720cf28ff3bd39032