Merge branches 'idx/verh' and 'idx/qmqpc'
authorMark Wooding <mdw@distorted.org.uk>
Tue, 14 Feb 2006 15:55:38 +0000 (15:55 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 14 Feb 2006 15:55:38 +0000 (15:55 +0000)
* idx/verh:
  [PATCH] Rewrite ##X tags in headers of incoming messages

* idx/qmqpc:
  [PATCH] qmqpc: Read servers from the command line.


Trivial merge