[python-django/epel7: 12/12] Merge branch 'master' into epel7

[Matthias Runge]

commit 0757e612490b45bad3e49077d7523c0efec3af03
Merge: 32553bb 62562c5
Author: Matthias Runge <mrunge at redhat.com>
Date:   Fri Apr 25 09:53:57 2014 +0200

    Merge branch 'master' into epel7
    
    Conflicts:
    	python-django.spec

 .gitignore                                         |    4 +
 ...-Removed-an-HTMLParser-test-that-doesn-t-.patch |   28 -----
 Django-1.4-no-internet-connection-tests.patch      |   43 --------
 Django-1.4-relax-scalability-req.patch             |   11 --
 python-django-1.6-py3-admin-completion             |   12 ++
 python-django.spec                                 |  110 +++++++++++---------
 sources                                            |    2 +-
 7 files changed, 80 insertions(+), 130 deletions(-)
---
diff --cc python-django.spec
index ae15667,2b2fc11..beaf805
--- a/python-django.spec
+++ b/python-django.spec
@@@ -592,12 -587,26 +587,33 @@@ pop
  
  
  %changelog
+ * Tue Apr 22 2014 Matthias Runge <mrunge at redhat.com> - 1.6.3-1
+ - update to 1.6.3 fixing CVE-2014-0473 and CVE-2014-0474
+ 
+ * Thu Mar 27 2014 Matthias Runge <mrunge at redhat.com> - 1.6.2-2
+ - remove simplejson requirement
+ - make bash-completion a sub-package, both main packages can require
+ 
+ * Thu Feb 13 2014 Matthias Runge <mrunge at redhat.com> - 1.6.2-1
+ - update to 1.6.2 (rhbz#1027766)
+ - bash completion for python3-django-admin (rhbz#1035987)
+ 
 +* Mon Jan 27 2014 Matthias Runge <mrunge at redhat.com> - 1.5.4-3
 +- python-simplejson is not a hard requirement any more
 +
 +* Thu Dec 19 2013 Dennis Gilmore <dennis at ausil.us> - 1.5.4-2
 +- disable python3 on epel7
 +
+ * Sun Nov 24 2013 Matěj Cepl <mcepl at redhat.com> - 1.6-1
+ - update to 1.6 (rhbz#1027766)
+ 
+ * Tue Oct 29 2013 Matthias Runge <mrunge at redhat.com> - 1.5.5-2
+ - fix obsoletes
+ 
+ * Mon Oct 28 2013 Matthias Runge <mrunge at redhat.com> - 1.5.5-1
+ - update to 1.5.5 (rhbz#1023407)
++>>>>>>> master
+ 
  * Mon Sep 16 2013 Matthias Runge <mrunge at redhat.com> - 1.5.4-1
  - fix CVE-2013-1443 (DoS via large passwords), fixes rhbz#1008281