commit | f9284ae8ede5b8977248a4259eee0cd81a100c16 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Nov 23 17:06:39 2014 -0600 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Nov 23 17:06:39 2014 -0600 |
tree | b3430fd55e6b76ee01dfd6ac4a0baa52de7b7a3a | |
parent | f1a3240ba86408a2cdb88a2bfa38a2dce1f4ed9c [diff] | |
parent | 7243b574e5fc6f9ae68dc5ebd8252047b8e78e3b [diff] |
merge 3.4 (#22921)