commit | 074b95da48ffb08605cf1faa80a98bea7cc8e99e | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Dec 07 13:47:39 2014 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Dec 07 13:47:39 2014 -0500 |
tree | 43c4bfb88c7687abeee149162e4aca479bc61953 | |
parent | b46247bee518487abcc9e17925d28d682b8e08ac [diff] | |
parent | b666697fa8e815ca09ace0cd6d4cd2bd76080f5e [diff] |
merge 3.4