Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 19 Mar 2017 12:47:02 +0000 (13:47 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 19 Mar 2017 12:47:02 +0000 (13:47 +0100)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Fix bacula-dir.conf template
  Drop dead bits in ftp_upload
  Fix portforwarder inetd config for new puppet


Trivial merge