From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 12 Jan 2013 22:40:11 +0000 (-0500)
Subject: merge default
X-Git-Tag: rel_0_8_0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7540bad8883a9a78a35192991f976d799129d689;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge default
---

7540bad8883a9a78a35192991f976d799129d689