[pkg-bacula-commits] [bacula] 01/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 8627597102eed4c99b702f7fe7f9ec44ca3dd2e8
Merge: 5a3add4 0c33906
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon May 30 14:28:57 2016 +0200

    Merge branch 'upstream'

 ReleaseNotes                           |   9 +-
 src/cats/create_postgresql_database.in |   2 +
 src/cats/update_mysql_tables.in        |   3 -
 src/cats/update_postgresql_tables.in   |   2 +-
 src/dird/Makefile.in                   |   5 +-
 src/dird/ua_output.c                   |   5 +-
 src/dird/ua_update.c                   |   5 +-
 src/findlib/fstype.c                   |   6 +-
 src/tools/Makefile.in                  |   7 +-
 src/tools/fstype.c                     |   6 +-
 src/tools/smtp-orig.c                  | 455 ---------------------------------
 src/version.h                          |   6 +-
 12 files changed, 27 insertions(+), 484 deletions(-)

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