]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 29 Sep 2014 23:12:44 +0000 (19:12 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 29 Sep 2014 23:12:44 +0000 (19:12 -0400)
1  2 
Objects/bytesobject.c

Simple merge