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

[Adrian Reber]

commit fbb8878e110fc31a60a046a0c418ca40da86619d
Merge: adcb913 87cdd50
Author: Adrian Reber <adrian at lisas.de>
Date:   Wed Jan 5 22:14:59 2011 +0100

    Merge branch 'master' into f14

 jabberd.spec |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --cc jabberd.spec
index e5fdc5b,ae63708..e140f59
--- a/jabberd.spec
+++ b/jabberd.spec
@@@ -197,17 -197,10 +197,15 @@@ f
  %attr(700, jabber, jabber) %{_var}/lib/%{name}
  
  %changelog
- * Wed Jan 05 2011 Adrian Reber <adrian at lisas.de> - 2.2.11-5
+ * Wed Jan 05 2011 Adrian Reber <adrian at lisas.de> - 2.2.11-6
  - ported spec changes from f14 branch to devel branch
- 
- * Wed Jan 05 2011 Adrian Reber <adrian at lisas.de> - 2.2.11-4
  - fix "jabberd spec file puts server.pem in /etc instead of /etc/jabberd" (#667504)
  
 +* Tue Nov 09 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 2.2.11-3
 +- re-add the server.pem ghost as %%config(noreplace) to prevent the
 +  file from being deleted when updating to this package
 +- fix permissions for directories and files under /var/lib/jabberd
 +
  * Wed Sep 29 2010 jkeating - 2.2.11-2
  - Rebuilt for gcc bug 634757