[python-markdown2/el6: 3/3] Merge branch 'master' into el6

[Thomas Moschny]

commit c1586308a909c71bac7a8cf31530d393aff563c0
Merge: b1611dc 7404ff2
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat May 19 16:35:41 2012 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	python-markdown2.spec

 .gitignore            |    1 +
 python-markdown2.spec |   95 ++++++++++++++++++++++++++++++++++++++++++++++--
 sources               |    2 +-
 3 files changed, 93 insertions(+), 5 deletions(-)
---
diff --cc python-markdown2.spec
index b5c726a,801981e..500eebd
--- a/python-markdown2.spec
+++ b/python-markdown2.spec
@@@ -65,9 -145,13 +145,16 @@@ pop
  
  
  %changelog
+ * Sat May 19 2012 Thomas Moschny <thomas.moschny at gmx.de> - 1.4.2-2
+ - Skip pygments test on rhel6.
+ 
+ * Sat May 19 2012 Thomas Moschny <thomas.moschny at gmx.de> - 1.4.2-1
+ - Update to 1.4.2.
+ - Build python3 subpackage.
+ 
 +* Sat Mar 17 2012 Thomas Moschny <thomas.moschny at gmx.de> - 1.1.1-2
 +- Skip pygments tests on rhel6.
 +
  * Fri Mar 16 2012 Thomas Moschny <thomas.moschny at gmx.de> - 1.1.1-1
  - Update to 1.1.1.