]> 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)
commit8d5225e5b8047d5c1201369caf8779d61a07ea8c
tree8f1d6d70b46d2bad8e5e823a994d5955f6526594
parent4c602d930798d77ddbb423538e2cee4a28d5aedf
parent2d17292489515f4983af12191fdebc61bef34651
Merge branch 'master' into readline-bconsole-restore

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