From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 26 Jul 2014 23:04:07 +0000 (-0400)
Subject: Merge branch 'master' into xdist_poc
X-Git-Tag: rel_1_0_0b1~276
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e65cb04974cc35e6f8301b9b7bc2a02d11edf139;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge branch 'master' into xdist_poc

Conflicts:
	lib/sqlalchemy/engine/url.py
---

e65cb04974cc35e6f8301b9b7bc2a02d11edf139