commit | a2f93885b07bd3e78d803e83a4a8d893273e6642 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Sep 28 12:57:22 2014 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Sep 28 12:57:22 2014 -0400 |
tree | b905c9a223a4dddcbecc7405e4010d7f2aaec97b | |
parent | c081262be6ceed935f56e9d21a9cefe02097223e [diff] | |
parent | c31f12d196455e916fcbcffc2cc2a3329abe70ed [diff] |
merge 3.4 (#22379)