[pkg-wine-party] [wine] 01/01: Merge tag 'debian/3.0-1' into buster ("theirs").

[Jens Reyer]

This is an automated email from the git hooks/post-receive script.

jreyer-guest pushed a commit to branch buster
in repository wine.

commit 3a1ef93256db054620af5083043b482b624de780
Merge: 08d3953 4cca513
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Mon Jan 22 20:47:02 2018 +0100

    Merge tag 'debian/3.0-1' into buster ("theirs").
    
    buster is now identical to 'debian/3.0-1'
    
    Commands used:
    git checkout debian/3.0-1
    git merge -s ours buster # Edit the commit message
    git branch TMP
    git checkout buster
    git reset --hard TMP
    git branch -D TMP


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git