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

[Sergio Pascual]

commit e329d3f5485a2e463b42ac2e704150e78b1a0649
Merge: 17ceb81 1c01062
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Tue Jul 29 15:31:35 2014 +0200

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

 pyfits.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc pyfits.spec
index df0a323,7220491..198ebb5
--- a/pyfits.spec
+++ b/pyfits.spec
@@@ -110,9 -117,9 +110,12 @@@ chmod 755 %{buildroot}%{python2_sitearc
  %endif # with_python3
  
  %changelog
 +* Tue Jul 29 2014 Sergio Pascual <sergiopr at fedoraproject.org> 3.3-1
 +- New upstream source (3.3)
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.4-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Tue Jun 03 2014 Sergio Pascual <sergiopr at fedoraproject.org> 3.2.4-1
  - New upstream source (3.2.4)