]> git.sur5r.net Git - bacula/bacula/commit
Merge branch 'master' into readline-bconsole-restore
authorEric Bollengier <eric@eb.homelinux.org>
Mon, 16 Nov 2009 10:00:34 +0000 (11:00 +0100)
committerEric Bollengier <eric@eb.homelinux.org>
Mon, 16 Nov 2009 10:00:34 +0000 (11:00 +0100)
commit3fe17b53281b5b18437a63036251e62bb6a5a414
tree7cb1599d025175e86a1c995237da91a3341fb351
parent88919076686a419ebe039294e1384dbfe3a67b8e
parentfeea3833d724dbbeb5813bb7ce9281ab5112a57b
Merge branch 'master' into readline-bconsole-restore

Conflicts:
bacula/technotes
bacula/src/console/console.c
bacula/src/dird/ua_dotcmds.c
bacula/technotes