]> git.sur5r.net Git - bacula/rescue/commit
Fix merge collision
authorKern Sibbald <kern@sibbald.com>
Wed, 11 Jan 2006 09:21:55 +0000 (09:21 +0000)
committerKern Sibbald <kern@sibbald.com>
Wed, 11 Jan 2006 09:21:55 +0000 (09:21 +0000)
commitc0905c612c4f07624da37f4ee772a1c4e02827a6
treed3d796a4ab003efed0abb2c1a147b4b9be1346bf
parentbff1f8afbbcf87a74e9828713e126a377a5515f5
Fix merge collision