]> granicus.if.org Git - python/commitdiff
merge heads v3.1.5rc2
authorBenjamin Peterson <benjamin@python.org>
Thu, 15 Mar 2012 18:57:38 +0000 (13:57 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 15 Mar 2012 18:57:38 +0000 (13:57 -0500)
1  2 
Include/patchlevel.h

Simple merge