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)
commit3720dd680be25cf0322d9eccf49b0b504add4411
tree911115641ec88fbe891cb2c66ee91dc2b1dad7a6
parent853cc1fedbca626ecc7ec56772184d782f13e864
parent34c57ee0a50ed7e0f8d077626ec265d915126c91
parent6d2736c0746b752cae7148c8e1637ec6cc9f9c1c
Merge branches 'idx/verh' and 'idx/qmqpc'

* idx/verh:
  [PATCH] Rewrite ##X tags in headers of incoming messages

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