From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 3 Jun 2013 19:18:16 +0000 (-0400)
Subject: Merge branch 'master' into ticket_1068
X-Git-Tag: rel_0_9_0b1~302
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84c42d9c64f4537935315e8c35f497e3300021a8;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge branch 'master' into ticket_1068
---

84c42d9c64f4537935315e8c35f497e3300021a8