]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 5 Jan 2015 20:39:06 +0000 (14:39 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 5 Jan 2015 20:39:06 +0000 (14:39 -0600)
1  2 
Doc/extending/extending.rst

Simple merge