From: mike bayer Date: Wed, 6 Apr 2016 17:32:10 +0000 (-0400) Subject: Merge "- don't load deferred columns on unexpire for merge with load=False, fixes... X-Git-Tag: rel_1_1_0b1~73 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=829bd30834cc0e56c4aa876a074b823d0f87cea9;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Merge "- don't load deferred columns on unexpire for merge with load=False, fixes #3488" --- 829bd30834cc0e56c4aa876a074b823d0f87cea9