]> git.sur5r.net Git - bacula/bacula/commitdiff
Merge branch 'master' into basejobv3
authorEric Bollengier <eric@eb.homelinux.org>
Mon, 2 Nov 2009 17:51:22 +0000 (18:51 +0100)
committerEric Bollengier <eric@eb.homelinux.org>
Mon, 2 Nov 2009 17:51:22 +0000 (18:51 +0100)
1  2 
bacula/src/dird/dird.c
bacula/src/jcr.h

Simple merge
Simple merge