]> git.sur5r.net Git - bacula/bacula/commit
Merge branch 'master' into basejobv3
authorEric Bollengier <eric@eb.homelinux.org>
Fri, 14 Aug 2009 12:37:44 +0000 (14:37 +0200)
committerEric Bollengier <eric@eb.homelinux.org>
Fri, 14 Aug 2009 12:37:44 +0000 (14:37 +0200)
commitaa941b9e61a7944ac6ad87d4adc82c099dedf2b3
treeb3e186d5c78f1f3a25745b78887e560c50b0316a
parentbb96f8021c347a68dd376127259841c280e72a67
parent95de37c02e180f7c051529edcbfc8d1b18e65480
Merge branch 'master' into basejobv3

Conflicts:
bacula/src/filed/backup.c
bacula/src/cats/cats.h
bacula/src/dird/dird_conf.c
bacula/src/filed/backup.c
bacula/src/filed/protos.h
bacula/src/jcr.h