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

[Toshio くらとみ]

commit dc919a737ddd90c4e9661f65d5c9ec9b979016ee
Merge: 0810b9f 1a03c3a
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Oct 18 11:55:54 2012 -0700

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

 python-decorator.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --cc python-decorator.spec
index 7df64f4,2bcd690..c351085
--- a/python-decorator.spec
+++ b/python-decorator.spec
@@@ -106,9 -106,15 +106,18 @@@ pop
  
  
  %changelog
 +* Thu Oct 18 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 3.4.0-1
 +- New upstream release
 +
+ * Sat Aug 04 2012 David Malcolm <dmalcolm at redhat.com> - 3.3.3-4
+ - rebuild for https://fedoraproject.org/wiki/Features/Python_3.3
+ 
+ * Fri Aug  3 2012 David Malcolm <dmalcolm at redhat.com> - 3.3.3-3
+ - remove rhel logic from with_python3 conditional
+ 
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Tue Apr 24 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 3.3.3-1
  - New upstream release