From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 7 Dec 2012 00:14:39 +0000 (-0500)
Subject: merge dance
X-Git-Tag: rel_0_8_0b2~17^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f55656186cc5e38e3f5bb4d1bbca1f3899954d2;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge dance
---

8f55656186cc5e38e3f5bb4d1bbca1f3899954d2