From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 23 Apr 2010 04:33:50 +0000 (-0400)
Subject: merge
X-Git-Tag: rel_0_6_1~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=085cb74edfbcfbb95a6c10f702aa717d997ea395;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge
---

085cb74edfbcfbb95a6c10f702aa717d997ea395
diff --cc setup.py
index f38f3759f9,723b05a2ce..3b64bc7f7b
--- a/setup.py
+++ b/setup.py
@@@ -117,12 -117,9 +117,9 @@@ SQLAlchemy's Advantages
      * Data mapping can be used in a row-based manner. Any bizarre hyper-optimized query that you or your DBA can cook up, you can run in SQLAlchemy, and as long as it returns the expected columns within a rowset, you can get your objects from it. For a rowset that contains more than one kind of object per row, multiple mappers can be chained together to return multiple object instance lists from a single database round trip.
      * The type system allows pre- and post- processing of data, both at the bind parameter and the result set level. User-defined types can be freely mixed with built-in types. Generic types as well as SQL-specific types are available.
  
- SVN version:
- <http://svn.sqlalchemy.org/sqlalchemy/trunk#egg=SQLAlchemy-dev>
- 
  """,
        classifiers = [
 -        "Development Status :: 4 - Beta",
 +        "Development Status :: 5 - Production/Stable",
          "Intended Audience :: Developers",
          "License :: OSI Approved :: MIT License",
          "Programming Language :: Python",