tree 22d78d5d3047256e56d849a266b31daba81d2359
parent 285e2e8403fb71e305146dc5cc98ad2d350cbaad
parent 1ef959ac3ddc4d96dfa1a613db5cb206cdaeb662
author Benjamin Peterson <benjamin@python.org> 1383151424 -0400
committer Benjamin Peterson <benjamin@python.org> 1383151424 -0400

merge 2.7.6 release branch