[pkg-wine-party] [wine] 03/03: Merge branch 'origin/master' into master

[Jens Reyer <jreyer-guest@moszumanska.debian.org>]

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

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

commit 71b283f014e5bcf8c9c75a7a532b400e84da25d3
Merge: 709827d 301c2dd
Author: Jens Reyer <jre.winesim@gmail.com>
Date:   Fri Apr 7 15:14:40 2017 +0200

    Merge branch 'origin/master' into master
    
    I had already pushed the new version before seeing the
    changes in git.
    
    # Conflicts:
    #	debian/changelog

 debian/scripts/import | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

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