[jabberd/el6: 17/17] Merge branch 'f14' into el6

[Dominic Hopf]

commit 71d09a7b8b7a7cb0553eca4bdaad589f2db25c98
Merge: 54c2655 c5f3b49
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Thu Jun 2 11:08:43 2011 +0200

    Merge branch 'f14' into el6
    
    Conflicts:
    	.gitignore

 .gitignore   |    3 ++-
 jabberd.spec |   38 ++++++++++++++++++++++++++++----------
 sources      |    2 +-
 3 files changed, 31 insertions(+), 12 deletions(-)
---
diff --cc jabberd.spec
index ae187c3,7a73507..e057e05
--- a/jabberd.spec
+++ b/jabberd.spec
@@@ -215,11 -236,8 +236,8 @@@ f
  - remove unneccessary defines for sysconfdir and don't use unneccessary macros
  - remove static libraries
  - fix a lot of rpmlint errors and warnings
 -- rename file jabberd to jabberd.init to make 'fedpkg mockbuild' possible 
 +- rename file jabberd to jabberd.init to make 'fedpkg mockbuild' possible
  
- * Wed Sep 29 2010 jkeating - 2.2.8-5.1
- - Rebuilt for gcc bug 634757
- 
  * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.8-5
  - use password-auth common PAM configuration instead of system-auth