| commit | 887cd7d981d062d82b906b64e3c313c7b43908f2 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Mar 31 13:46:45 2014 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Mar 31 13:46:45 2014 -0400 |
| tree | 890762bbd897d32849416b2f832c2539946317ab | |
| parent | d2403a21e40a884d6dcc9a17bb491ad5447c6dbe [diff] | |
| parent | b25e3f9e6a1a8ea292335a23eb7dea9d8174efa1 [diff] |
merge 3.3 (#21115)