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

[Toshio くらとみ]

commit 65e8e1e35e64fd7c4ff69feb9e88462fa79e1050
Merge: fa0dd58 39d5a14
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Sun Jul 17 19:31:11 2011 -0700

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

 python-migrate0.5.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc python-migrate0.5.spec
index 8ead1b5,aaa2421..f340d98
--- a/python-migrate0.5.spec
+++ b/python-migrate0.5.spec
@@@ -73,9 -73,9 +73,12 @@@ echo 'sqlite:///__tmp__' > test_db.cf
  %{python_sitelib}/*
  
  %changelog
 +* Fri Jul 15 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.4-1
 +- Update to new upstream bugfix release
 +
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.3-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Thu Jan 13 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.3-8
  - Fix Requires on sqlalchemy0.5 -- no need for the compat version of
    SQLAlchemy on epel.