From: Hajime Nakagami <nakagami@gmail.com>
Date: Thu, 7 Mar 2013 14:46:46 +0000 (+0900)
Subject: merge from default
X-Git-Tag: rel_0_8_1~10^2~2^2^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a4945ebdd1358502e1872560b97f1344b8c53db;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge from default
---

7a4945ebdd1358502e1872560b97f1344b8c53db