commit | 21df71ae8e9f7ed1a0f3de6923fa30961ac15888 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Sep 22 22:44:21 2014 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Sep 22 22:44:21 2014 -0400 |
tree | 76d58f042a520acf4b44bbd83bc38a06798a0c4e | |
parent | 49a29571e98a8268ef7847a746b66831c3052e68 [diff] | |
parent | eb83ffe1b3ffda0179b83244a4c25afe367c1b4d [diff] |
merge 3.4 (#22459)