]> 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)
commit8738499c5fd86d8df1595b7b64cdee115f25cc14
tree1f9b81dfe1600c10215236b3318990596a7d3923
parentbefa6e13a2e22e9c93b7bb313f6f3b65b0ebf95b
parentdec3b240cbd1fd04273f869308ced2b57db0277f
Merge branch 'master' of ssh://bacula.git.sourceforge.net/gitroot/bacula

Conflicts:
bacula/technotes
bacula/technotes