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

[Matthias Runge]

commit 19aab371c4676836cfac80a53b73eb5e5ed52efc
Merge: 156ad62 a0b3f8c
Author: Matthias Runge <mrunge at redhat.com>
Date:   Mon Aug 25 08:11:26 2014 +0200

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

 python-django.spec |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --cc python-django.spec
index 79f706c,8f6a804..1aed1c5
--- a/python-django.spec
+++ b/python-django.spec
@@@ -16,8 -16,8 +16,9 @@@
  %global         obs_ver 1.5.5-3
  
  Name:           python-django
 -Version:        1.6.5
 -Release:        3%{?dist}
++
 +Version:        1.6.6
 +Release:        1%{?dist}
  Summary:        A high-level Python Web framework
  
  Group:          Development/Languages
@@@ -587,13 -587,12 +588,21 @@@ pop
  
  
  %changelog
++
 +* Thu Aug 21 2014 Matthias Runge <mrunge at redhat.com> - 1.6.6-1
 +- update to 1.6.6 
 +- fix CVE-2014-0480 (rhbz#1129950)
 +- fix CVE-2014-0481 (rhbz#1129952)
 +- fix CVE-2014-0482 (rhbz#1129954)
 +- fix CVE-2014-0483 (rhbz#1129959)
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.5-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+ * Wed May 28 2014 Kalev Lember <kalevlember at gmail.com> - 1.6.5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
+ 
++
  * Fri May 16 2014 Matthias Runge <mrunge at redhat.com> - 1.6.5-1
  - update to 1.6.5 CVE-2014-1418, CVE-2014-3730 (rhbz#1097935)