[pkg-bacula-commits] [bacula] 02/03: Merge branch 'upstream'

[Carsten Leonhardt]

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

leo pushed a commit to branch master
in repository bacula.

commit 0d3a868ccbfd08f5460ceaf80a6a0482968e30e8
Merge: 3c8c171 9dbdab5
Author: Carsten Leonhardt <leo at debian.org>
Date:   Tue Mar 14 01:16:28 2017 +0100

    Merge branch 'upstream'

 ChangeLog              | 20 +++++++++++++++++++-
 ReleaseNotes           | 28 ++++++++++++++++++++++++++--
 release/sign           |  4 ++--
 src/filed/xacl.c       | 12 ++++++++++--
 src/lib/address_conf.c |  2 +-
 src/lib/bsock.c        | 10 ++++++++++
 src/stored/askdir.c    |  3 +--
 src/stored/wait.c      |  6 +++---
 src/version.h          |  6 +++---
 9 files changed, 75 insertions(+), 16 deletions(-)

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