Merge branch 'master' into f22

Conflicts:
	python-cryptography.spec
This commit is contained in:
Matěj Cepl 2015-11-08 23:58:21 +01:00
commit 87251326f5

View file

@ -10,7 +10,7 @@
Name: python-cryptography
Version: 1.0.2
Release: 1%{?dist}
Release: 3%{?dist}
Summary: PyCA's cryptography library
Group: Development/Libraries
@ -106,9 +106,12 @@ popd
%changelog
* Wed Sep 30 2015 Matěj Cepl <mcepl@redhat.com> - 1.0.2-1
* Sun Nov 08 2015 Matěj Cepl <mcepl@redhat.com> - 1.0.2-3
- New upstream release (fix #1267548)
* Wed Nov 04 2015 Robert Kuska <rkuska@redhat.com> - 1.0.2-2
- Rebuilt for Python3.5 rebuild
* Wed Aug 12 2015 Nathaniel McCallum <npmccallum@redhat.com> - 1.0-1
- New upstream release