[python-django-nose: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django-nose

[Matthias Runge]

commit c91664351a80bb77a601ee76555f530f3c358418
Merge: 6a8e8d8 293adf2
Author: Matthias Runge <mrunge at redhat.com>
Date:   Fri Feb 27 12:31:24 2015 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-django-nose
    
    Conflicts:
    	python-django-nose.spec

 python-django-nose.spec | 3 +++
 1 file changed, 3 insertions(+)
---
diff --cc python-django-nose.spec
index 8abff0e,ed3ddf0..f7a62d5
--- a/python-django-nose.spec
+++ b/python-django-nose.spec
@@@ -48,10 -41,9 +48,13 @@@ rm -rf django_nose.egg-inf
  
  
  %changelog
 +* Fri Feb 27 2015 Matthias Runge <mrunge at redhat.com> - 1.3-1
 +- update to 1.3
 +- add patch for Django-1.8 compatibility
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Fri Mar 28 2014 Matthias Runge <mrunge at redhat.com> - 1.2-1
  - update to 1.2