[python-chameleon: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-chameleon

[Toshio くらとみ]

commit 750b62f208e421266ab8f29e0347ed0c02e9eec4
Merge: 092a2ef 145c2f7
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Aug 10 10:14:48 2011 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-chameleon
    
    Conflicts:
    	python-chameleon.spec

 python-chameleon.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc python-chameleon.spec
index 4a42709,7aa7e13..9cc13e4
--- a/python-chameleon.spec
+++ b/python-chameleon.spec
@@@ -76,13 -95,9 +76,17 @@@ rm -rf %{buildroot
  
  
  %changelog
++<<<<<<< HEAD
 +* Wed Aug 10 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2-1
 +- New upstream release
 +
 +* Fri Jul 15 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 2.0-1
 +- New upstream release
 +- This release removes the genshi-like syntax support -- F17+, only
 +
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.12-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Sat Sep 18 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.2.12-4
  - Move COPYING file out of the ast directory and into docdir.