From: Dirk H Bartley <dbartley@schupan.com>
Date: Wed, 25 Jul 2007 02:32:37 +0000 (+0000)
Subject: The result of the following merge:  This merges the work in the branch into the head.
X-Git-Tag: Release-2.2.0~96
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fd405a76806b90bcf54d4efca80a8176d458dae9;p=bacula%2Frescue

The result of the following merge:  This merges the work in the branch into the head.
This does not quite work yet, working with kern on getting changes in the server!
svn merge -r5136:5238 https://bacula.svn.sourceforge.net/svnroot/bacula/branches/working/qt-console .
---