[jemalloc: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/jemalloc

[Ingvar Hagelund]

commit 5547e1b6e064e79e1a075b809f58f9c03fbe08bb
Merge: bf72c33 579a078
Author: Ingvar Hagelund <ingvar at redpill-linpro.com>
Date:   Tue Mar 15 15:35:01 2011 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/jemalloc
    
    Conflicts:
    	jemalloc.spec

 jemalloc.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc jemalloc.spec
index ebe6b78,d45edf1..5ee4df9
--- a/jemalloc.spec
+++ b/jemalloc.spec
@@@ -1,7 -1,7 +1,7 @@@
  Name:           jemalloc
 -Version:        2.1.1
 +Version:        2.1.3
  
- Release:        1%{?dist}
+ Release:        2%{?dist}
  Summary:        General-purpose scalable concurrent malloc implementation
  
  Group:          System Environment/Libraries
@@@ -74,9 -74,9 +74,12 @@@ rm -rf %{buildroot
  %postun -p /sbin/ldconfig
  
  %changelog
 +* Tue Feb 01 2011 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.3-1
 +- New upstream release
 +
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue Feb 01 2011 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.1-1
  - New upstream release