[jabberd/el6: 2/2] Merge branch 'f17' into el6

[Adrian Reber]

commit 198dfea2ebd12ac08e966bf49c037b5275bf2faf
Merge: 22b82d4 350382b
Author: Adrian Reber <adrian at lisas.de>
Date:   Wed Aug 22 09:10:29 2012 +0200

    Merge branch 'f17' into el6

 aabcffae560d5fd00cd1d2ffce5d760353cf0a4d.patch |   34 ++++++++++++++++++++++++
 jabberd.spec                                   |   10 ++++++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---