bareos-webui: bareos-17.2 94cb3b06

Author Committer Branch Timestamp Parent
frank frank bareos-17.2 2018-01-15 12:27 bareos-17.2 edd7bad4 Pending
Changeset Merge branch 'bareos-16.2' into bareos-17.2

Resolved Conflicts:

    AUTHORS
mod - AUTHORS Diff File