]> 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)
commit01fb38bce8f49cec19784d67be60abddfb32395b
tree1459c8f1c4b61460f8e4bed324e1ea0224428516
parentec4f6ce090161253cd9ef8bc11d1872e6b8bdff0
parent29ba62220dfd06d95f6c10bf3a43c2c2e12c5ed5
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