[jabberd] - trying to sync changelogs from master and f14 branch

[Adrian Reber]

commit 412d1f39c19b6340f16edbbe435fc78b3049cfb9
Author: Adrian Reber <adrian at lisas.de>
Date:   Wed Jan 5 22:06:03 2011 +0100

    - trying to sync changelogs from master and f14 branch

 jabberd.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/jabberd.spec b/jabberd.spec
index f508ba3..f1c617d 100644
--- a/jabberd.spec
+++ b/jabberd.spec
@@ -1,7 +1,7 @@
 Summary:        OpenSource server implementation of the Jabber protocols
 Name:           jabberd
 Version:        2.2.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv2+
 Group:          System Environment/Daemons
 Source0:        http://ftp.xiaoka.com/jabberd2/releases/jabberd-%{version}.tar.bz2
@@ -197,10 +197,10 @@ fi
 %attr(700, jabber, jabber) %{_var}/lib/%{name}
 
 %changelog
-* Wed Jan 05 2011 Adrian Reber <adrian at lisas.de> - 2.2.11-4
+* Wed Jan 05 2011 Adrian Reber <adrian at lisas.de> - 2.2.11-5
 - ported spec changes from f14 branch to devel branch
 
-* Wed Jan 05 2011 Adrian Reber <adrian at lisas.de> - 2.2.11-3
+* 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)
 
 * Wed Sep 29 2010 jkeating - 2.2.11-2