[rabbitmq-server/el5/master: 2/2] Merge branch 'master' into el5

[Hubert Plociniczak]

commit 240740db7c5e63f010afdf76b3bad3e002aadf0d
Merge: 473b9de f810d2a
Author: Hubert Plociniczak <hubert.plociniczak at gmail.com>
Date:   Tue Nov 2 00:37:27 2010 +0100

    Merge branch 'master' into el5

 .gitignore           |    1 +
 rabbitmq-server.spec |    5 ++++-
 sources              |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc rabbitmq-server.spec
index bf74268,f94e48e..d5e786e
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@@ -129,8 -128,12 +129,11 @@@ don
  rm -rf %{buildroot}
  
  %changelog
+ * Mon Nov 1 2010 Hubert Plociniczak <hubert.plociniczak at gmail.com> 2.1.1-1
+ - New Upstream Release
+ 
  * Tue Oct 5 2010 Hubert Plociniczak <hubert.plociniczak at gmail.com> 2.1.0-1
  - New Upstream Release
 -- Added python as a build dependency
  
  * Mon Aug 23 2010 Mike Bridgen <mikeb at rabbitmq.com> 2.0.0-1
  - New Upstream Release