[python3/f20: 2/2] Merge branch 'f20' of ssh://pkgs.fedoraproject.org/python3 into f20

[Miro Hrončok]

commit 89a07f720dc9407abf2abba76b116ae70b1dc9db
Merge: 303eacc 0b48f42
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Mon Jun 30 18:59:32 2014 +0200

    Merge branch 'f20' of ssh://pkgs.fedoraproject.org/python3 into f20
    
    Conflicts:
    	python3.spec

 00194-json-add-boundary-check.patch |   37 +++++++++++++++++++++++++++++++++++
 python3.spec                        |   15 ++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)
---
diff --cc python3.spec
index 505c698,87146f4..74fc7c0
--- a/python3.spec
+++ b/python3.spec
@@@ -126,7 -126,7 +126,7 @@@
  Summary: Version 3 of the Python programming language aka Python 3000
  Name: python3
  Version: %{pybasever}.2
--Release: 16%{?dist}
++Release: 17%{?dist}
  License: Python
  Group: Development/Languages
  
@@@ -1773,9 -1780,10 +1780,13 @@@ rm -fr %{buildroot
  # ======================================================
  
  %changelog
- * Mon Jun 30 2014 Miro Hrončok <mhroncok at redhat.com> - 3.3.2-16
++* Mon Jun 30 2014 Miro Hrončok <mhroncok at redhat.com> - 3.3.2-17
 +- Rewrite the config wrapper from Bash to Python, so it can be interpreted with Python
 +
+ * Mon Jun 30 2014 Matej Stuchlik <mstuchli at redhat.com> - 3.3.2-16
+ - JSON module could read arbitrary process memory
+ Resolves: rhbz#1112293
+ 
  * Fri May 30 2014 Miro Hrončok <mhroncok at redhat.com> - 3.3.2-15
  - In config script, use uname -m to write the arch