From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 13 Aug 2012 21:54:47 +0000 (-0400)
Subject: merge tip.
X-Git-Tag: rel_0_8_0b1~251
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d212f7e554426dfc7892288a7221e6d514df3395;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge tip.
---

d212f7e554426dfc7892288a7221e6d514df3395
diff --cc doc/build/core/expression_api.rst
index 33a4035cb0,f2bcf2a0de..132b38b6af
--- a/doc/build/core/expression_api.rst
+++ b/doc/build/core/expression_api.rst
@@@ -178,10 -200,10 +178,9 @@@ Classe
     :show-inheritance:
  
  .. autoclass:: sqlalchemy.sql.operators.Operators
 -   :members: __and__, __or__, __invert__, op, operate, reverse_operate
 -   :undoc-members:
 -
 +   :members:
 +   :special-members:
  
- 
  .. autoclass:: Select
     :members:
     :show-inheritance: