commit | 43e3d22fee9b22f6f9dec4364ea4ee796faefaab | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Fri May 08 21:32:36 2015 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Fri May 08 21:32:36 2015 -0400 |
tree | ce42574733e52db076fa6719ad683d11b537aad4 | |
parent | 9020a9a226ec868d98a3f262efccc90295463f1c [diff] | |
parent | 07abcf58d98f2f2ae36a4cb20331b9e72b36ad4d [diff] |
merge 3.4 (#23042)