From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 30 May 2014 16:08:26 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/tlocke/sqlalchemy into tlocke-master
X-Git-Tag: rel_1_0_0b1~404
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f000161f242f6814d594b5ccf91f96d99490ae61;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge branch 'master' of https://github.com/tlocke/sqlalchemy into tlocke-master
---

f000161f242f6814d594b5ccf91f96d99490ae61