[pulseaudio] 02/06: Merge tag 'upstream/7.1' into master

[Felipe Sateler]

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

fsateler pushed a commit to branch master
in repository pulseaudio.

commit dd2cfa668890e2764e435ff11b819907c05781ae
Merge: c00df97 38f0792
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sun Nov 1 13:35:49 2015 -0300

    Merge tag 'upstream/7.1' into master
    
    Upstream version 7.1

 .tarball-version                                   |  2 +-
 .version                                           |  2 +-
 Makefile.in                                        |  2 +-
 NEWS                                               | 18 ++++++++++++++++++
 configure                                          | 22 +++++++++++-----------
 configure.ac                                       |  2 +-
 man/pulseaudio.1                                   |  2 +-
 man/pulseaudio.1.xml.in                            |  4 +++-
 src/daemon/main.c                                  |  8 ++++++++
 src/daemon/systemd/user/pulseaudio.service.in      |  2 ++
 src/modules/alsa/alsa-mixer.c                      |  6 +++---
 src/modules/alsa/alsa-ucm.c                        |  1 -
 src/modules/alsa/mixer/paths/analog-input.conf     |  6 ++++++
 .../alsa/mixer/paths/analog-output-lineout.conf    |  8 ++++++++
 .../mixer/paths/analog-output-speaker-always.conf  |  4 ++++
 .../alsa/mixer/paths/analog-output-speaker.conf    |  4 ++++
 src/modules/module-null-sink.c                     |  6 ++++--
 src/pulse/version.h                                |  4 ++--
 src/pulsecore/pstream.c                            | 11 ++++++++++-
 src/pulsecore/shm.c                                | 10 +++++++---
 20 files changed, 95 insertions(+), 29 deletions(-)

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