]> granicus.if.org Git - python/commitdiff
merge 3.3 (#19805)
authorBenjamin Peterson <benjamin@python.org>
Wed, 27 Nov 2013 05:05:37 +0000 (23:05 -0600)
committerBenjamin Peterson <benjamin@python.org>
Wed, 27 Nov 2013 05:05:37 +0000 (23:05 -0600)
1  2 
Doc/faq/programming.rst

Simple merge