]> git.sur5r.net Git - bacula/bacula/commit
Merge branch 'master' of ssh://bacula.git.sourceforge.net/gitroot/bacula
authorKern Sibbald <kern@sibbald.com>
Thu, 13 Aug 2009 17:26:13 +0000 (19:26 +0200)
committerKern Sibbald <kern@sibbald.com>
Thu, 13 Aug 2009 17:26:13 +0000 (19:26 +0200)
commit3b5531b07a9717f4d3054a5ac8f60cd987241d8d
tree4fc8d1c1b7c4e9332fe18b441760a7401189107c
parent0cf2557496372bda942d276f9281684135965d99
parent404ee59f3906f4d929a26e01f09ae11eb4a7929d
Merge branch 'master' of ssh://bacula.git.sourceforge.net/gitroot/bacula

Conflicts:
bacula/technotes
bacula/technotes