bareos: master 01236bfc

Diff Back to Repository
Author Committer Branch Timestamp Parent
Frank Bergkemper Frank Bergkemper master 2016-06-17 19:22 master d047b52e Pending
Changeset Merge branch 'bareos-15.2'

Conflicts:
    module/Application/view/layout/layout.phtml