Merge branch 'master' of github.com:netmanagers/puppet-bacula
Move templates to subdirs to be consistent with the manifests