[python-tw2-forms: 4/5] Merge branch 'epel7'

[Ralph Bean]

commit 2e26ac55f2c8460bddaa70e3e439d2708269a157
Merge: eea655d a8eabac
Author: Ralph Bean <rbean at redhat.com>
Date:   Mon Apr 28 10:12:48 2014 -0400

    Merge branch 'epel7'
    
    Conflicts:
    	python-tw2-forms.spec

 python-tw2-forms.spec |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)
---
diff --cc python-tw2-forms.spec
index 9c99d79,1036ab2..5366dee
--- a/python-tw2-forms.spec
+++ b/python-tw2-forms.spec
@@@ -82,11 -66,8 +66,12 @@@ tw2.forms contains the basic form widge
  
  
  %changelog
 -* Fri Jan 10 2014 Ralph Bean <rbean at redhat.com> - 2.1.4.1-4
 +* Tue Aug 06 2013 Ralph Bean <rbean at redhat.com> - 2.1.4.1-5
 +- Temporarily disable test suite until the 2.2 release.
 +
 +* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.4.1-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ - Disable tests for epel7.
  
  * Thu Feb 28 2013 Ralph Bean <rbean at redhat.com> - 2.1.4.1-3
  - Rename Jinja2 to jinja2 for el6.