commit | 95283fb58951aaa0ee7cfefcbf8785f132819529 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu May 07 18:42:16 2015 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Thu May 07 18:42:16 2015 -0400 |
tree | d92b15cadfa1d526d0e8fee7bbc9481234643a88 | |
parent | 2533d88a9cd2fc04e8b90788c5f17daef0d09cf3 [diff] | |
parent | 9e77f72fb2b247d7024e37a106ed2791bb7298d7 [diff] |
Merge 3.4