[pulseaudio] 01/02: Merge tag 'upstream/6.0' into debian/experimental

[Luke Yelavich]

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

themuso-guest pushed a commit to branch debian/experimental
in repository pulseaudio.

commit c45e5a632dfeb3b86657253ba11b98c969d403ed
Merge: a620ece 03f5d80
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Fri Feb 13 11:08:40 2015 +1100

    Merge tag 'upstream/6.0' into debian/experimental
    
    Upstream version 6.0

 .tarball-version                                     |  2 +-
 .version                                             |  2 +-
 NEWS                                                 |  8 +++++++-
 configure                                            | 20 ++++++++++----------
 shell-completion/bash/pulseaudio                     |  2 +-
 src/Makefile.am                                      |  2 +-
 src/Makefile.in                                      |  3 ++-
 .../mixer/paths/analog-output-speaker-always.conf    |  8 ++++++++
 .../alsa/mixer/paths/analog-output-speaker.conf      |  8 ++++++++
 src/modules/alsa/mixer/profile-sets/default.conf     |  2 +-
 .../profile-sets/force-speaker-and-int-mic.conf      |  2 +-
 .../alsa/mixer/profile-sets/force-speaker.conf       |  2 +-
 src/modules/alsa/module-alsa-card.c                  |  6 ++++++
 src/modules/module-device-restore.c                  |  1 +
 src/modules/module-loopback.c                        |  2 +-
 src/pulse/version.h                                  |  6 +++---
 16 files changed, 53 insertions(+), 23 deletions(-)

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