[pkg-wine-party] [wine] 05/17: Merge branch 'upstream'

[Jens Reyer]

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

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

commit fe4e7aedd365185c24d29e0a68d3f7f1ee5bb13e
Merge: dc84194 16db309
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Fri Jan 19 18:02:54 2018 +0100

    Merge branch 'upstream'

 ANNOUNCE           | 465 +++++++++++++++++++++++++++++++++++++++--------------
 VERSION            |   2 +-
 configure          |  18 +--
 dlls/ntdll/relay.c |   3 +-
 po/de.po           |   4 +-
 5 files changed, 359 insertions(+), 133 deletions(-)

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