[python-sqlalchemy/f17: 5/5] Merge branch 'f18' into f17

[Toshio くらとみ]

commit 8582e905a234c0dbe69dbc90d843ee8174306c1a
Merge: 89d0ba2 4ff89c8
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Nov 1 08:20:59 2012 -0700

    Merge branch 'f18' into f17
    
    Conflicts:
    	.gitignore
    	python-sqlalchemy.spec
    	sources

 .gitignore             |   13 +------------
 python-sqlalchemy.spec |   15 +++++++++++++--
 sources                |    2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)
---
diff --cc .gitignore
index e059298,0e03c39..c3ff55e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,12 -1,14 +1,1 @@@
--SQLAlchemy-0.6.1.tar.gz
--/SQLAlchemy-0.6.3.tar.gz
--/SQLAlchemy-0.6.4.tar.gz
--/SQLAlchemy-0.6.5.tar.gz
--/SQLAlchemy-0.6.6.tar.gz
--/SQLAlchemy-0.7.1.tar.gz
--/SQLAlchemy-0.7.2.tar.gz
--/SQLAlchemy-0.7.3.tar.gz
--/SQLAlchemy-0.7.5.tar.gz
--/SQLAlchemy-0.7.6.tar.gz
--/SQLAlchemy-0.7.7.tar.gz
--/SQLAlchemy-0.7.8.tar.gz
 -/SQLAlchemy-0.7.9dev.tar.gz
+ /SQLAlchemy-0.7.9.tar.gz