[python-testtools/epel7: 7/7] Merge branch 'master' into epel7

[Pádraig Brady]

commit f17493a7f8597fa1fd674e095f353afe736e7254
Merge: 67d998f 0f1a7fb
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Nov 18 04:38:29 2014 +0000

    Merge branch 'master' into epel7
    
    Conflicts:
    	.gitignore
    	python-testtools.spec
    	sources

 .gitignore            |    2 +-
 python-testtools.spec |   20 +++++++++++++++-----
 sources               |    2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index fdd3789,9900258..2cfba3e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/testtools-0.9.35.tar.gz
+ /testtools-1.1.0.tar.gz
diff --cc python-testtools.spec
index bb1ebcf,d7e6b82..2fccba0
--- a/python-testtools.spec
+++ b/python-testtools.spec
@@@ -131,6 -136,20 +136,11 @@@ pop
  
  
  %changelog
+ * Fri Sep 19 2014 Jerry James <loganjerry at gmail.com> - 1.1.0-1
+ - Update to 1.1.0 (bz 1132881)
+ - Fix license handling
+ - Note bundling exception for jquery in -doc
+ 
 -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.35-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
 -* Wed May 14 2014 Bohuslav Kabrda <bkabrda at redhat.com> - 0.9.35-3
 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
 -
 -* Fri Feb 28 2014 Matthias Runge <mrunge at redhat.com> - 0.9.35-2
 -- re-enable building the python3-subpackage
 -
  * Mon Feb  3 2014 Michel Salim <salimma at fedoraproject.org> - 0.9.35-1
  - Update to 0.9.35