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

[Matthias Runge]

commit 49a83845d326e44a7c675911706ae4665bc73ec0
Merge: 9e8d6c3 490dad2
Author: Matthias Runge <mrunge at redhat.com>
Date:   Mon Aug 25 14:12:25 2014 +0200

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

 python-django14.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc python-django14.spec
index d68e677,e8ffab1..2f9dd5c
--- a/python-django14.spec
+++ b/python-django14.spec
@@@ -321,10 -321,9 +321,13 @@@ cd test
  
  
  %changelog
 +* Mon Aug 25 2014 Matthias Runge <mrunge at redhat.com> - 1.4.14-1
 +- update to 1.4.14 fixing CVE-2014-0480 CVE-2014-0481 CVE-2014-0482,
 +  CVE-2014-0483
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.13-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Fri May 16 2014 Matthias Runge <mrunge at redhat.com> - 1.4.13-1
  - update to 1.4.13 fixing CVE-2014-1418 (rhbz#1097936)