[jabberd/el6/master: 5/5] Merge branch 'f14' into el6

[Adrian Reber]

commit 54c2655fff7eb07605ca177e9415c3ebfd6336eb
Merge: b325a61 c76aff3
Author: Adrian Reber <adrian at lisas.de>
Date:   Wed Dec 8 15:12:12 2010 +0100

    Merge branch 'f14' into el6
    
    Conflicts:
    	.gitignore
    	jabberd.spec

 .gitignore   |    2 +-
 jabberd.spec |   21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 392558c,b47ab65..f37f6a2
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--jabberd-2.2.8.tar.bz2
+ jabberd-2.2.11.tar.bz2