]> granicus.if.org Git - python/commitdiff
merge 3.2 (#13259)
authorBenjamin Peterson <benjamin@python.org>
Tue, 25 Oct 2011 04:04:10 +0000 (00:04 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 25 Oct 2011 04:04:10 +0000 (00:04 -0400)
1  2 
Doc/reference/datamodel.rst

Simple merge