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

[Adrian Reber]

commit 22b82d40884ebe84b214aecb6680479adf3753de
Merge: 71d09a7 2c5201c
Author: Adrian Reber <adrian at lisas.de>
Date:   Tue Jul 24 10:30:15 2012 +0200

    Merge branch 'f17' into el6
    
    Conflicts:
    	jabberd.spec

 jabberd.init |    2 +-
 jabberd.spec |   22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)
---