commit | eca72d47f5a639a0ac66a98a2d63b30df2ce310f | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Fri Dec 05 20:34:56 2014 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Fri Dec 05 20:34:56 2014 -0500 |
tree | 5c67eee0bab41a933c82c1d0d2540e4215cad215 | |
parent | f990e7f1f0de45a07bab0e520d01f706b6f46569 [diff] | |
parent | 81b7374fbe5f77567642d5aa42d4c1e6eee610b2 [diff] |
merge 3.3 (#16043)