[jemalloc: 2/2] merge from epel7 branch, who got 3.5.1 first Merge branch 'master' of ssh://pkgs.fedoraproject.org/j

[Ingvar Hagelund]

commit d777f7cf071e89023dbc1020511cd3c12ab222ac
Merge: a469269 ef5a0a2
Author: Ingvar Hagelund <ingvar at redpill-linpro.com>
Date:   Fri Mar 28 10:52:41 2014 +0100

    merge from epel7 branch, who got 3.5.1 first
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/jemalloc
    
    Conflicts:
    	jemalloc.spec

 jemalloc.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc jemalloc.spec
index a86e4ec,61afa8b..145b11f
--- a/jemalloc.spec
+++ b/jemalloc.spec
@@@ -88,11 -88,9 +88,14 @@@ rm -rf %{buildroot
  %postun -p /sbin/ldconfig
  
  %changelog
 +* Fri Mar 28 2014 Ingvar Hagelund <ingvar at redpill-linpro.com> - 3.5.1-1
 +- New upstream release
 +- Updated nopprof patch to match new release
 +- Fixed a few bogus changelog entries
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Fri Jun 07 2013 Ingvar Hagelund <ingvar at redpill-linpro.com> - 3.4.0-1
  - New upstream release