[jabberd/f14/master: 3/3] Merge branch 'master' into f14

[Adrian Reber]

commit 5bb186e3a82ea05e329f555b7971081a47035735
Merge: 7baa533 d10666e
Author: Adrian Reber <adrian at lisas.de>
Date:   Wed Jan 5 22:55:08 2011 +0100

    Merge branch 'master' into f14

 jabberd.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---