]> git.sur5r.net Git - bacula/bacula/commitdiff
Merge branch 'master' into basejobv3
authorEric Bollengier <eric@eb.homelinux.org>
Fri, 16 Oct 2009 16:11:35 +0000 (16:11 +0000)
committerEric Bollengier <eric@eb.homelinux.org>
Fri, 16 Oct 2009 16:11:35 +0000 (16:11 +0000)
1  2 
bacula/src/baconfig.h
bacula/src/dird/job.c

Simple merge
Simple merge