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

[Hubert Plociniczak]

commit 5ab2a1b81f8812decc5bba37cd5c3662b71ca1b9
Merge: 884369c f810d2a
Author: Hubert Plociniczak <hubert.plociniczak at gmail.com>
Date:   Mon Nov 1 23:59:44 2010 +0100

    Merge branch 'master' into f13

 .gitignore           |    1 +
 rabbitmq-server.spec |    5 ++++-
 sources              |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc rabbitmq-server.spec
index 725d224,f94e48e..798f994
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@@ -127,8 -128,12 +127,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