From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 11 Dec 2010 08:10:17 +0000 (-0500)
Subject: do the mercurial dance (re-merge what I just merged...)
X-Git-Tag: rel_0_7b1~180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b88c54f95be3e3bc2e0923181d56862fa3fda9fa;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

do the mercurial dance (re-merge what I just merged...)
---

b88c54f95be3e3bc2e0923181d56862fa3fda9fa