]> granicus.if.org Git - python/commitdiff
merge 3.3 (#20110)
authorBenjamin Peterson <benjamin@python.org>
Thu, 2 Jan 2014 22:48:24 +0000 (16:48 -0600)
committerBenjamin Peterson <benjamin@python.org>
Thu, 2 Jan 2014 22:48:24 +0000 (16:48 -0600)
1  2 
Doc/reference/datamodel.rst

Simple merge