]> git.sur5r.net Git - bacula/bacula/commit
Merge branch 'master' into basejobv3
authorEric Bollengier <eric@eb.homelinux.org>
Wed, 30 Sep 2009 09:59:44 +0000 (11:59 +0200)
committerEric Bollengier <eric@eb.homelinux.org>
Wed, 30 Sep 2009 09:59:44 +0000 (11:59 +0200)
commitc688534fc7505bf25db4d4137de97c5671b9e493
treecc79997c00207155e1f6ba08e6cdad7ea330396c
parentd9013540f1f7d8becb3c4fcb247d8e7a7f394d00
parente732f1a132f3230783391843bacd02f8f1baf591
Merge branch 'master' into basejobv3

Conflicts:
regress/tests/speed-test
bacula/src/baconfig.h
bacula/src/cats/sql_cmds.c
bacula/src/dird/dird.c
bacula/src/dird/dird_conf.c
bacula/src/findlib/find_one.c