]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Wed, 1 Jun 2011 02:31:59 +0000 (21:31 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 1 Jun 2011 02:31:59 +0000 (21:31 -0500)
1  2 
Modules/_sqlite/connection.c

Simple merge