| commit | 6c22e65773c94ff810bd7adbb43c2b52e269598a | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sun Nov 23 20:38:13 2014 -0600 |
| committer | Benjamin Peterson <benjamin@python.org> | Sun Nov 23 20:38:13 2014 -0600 |
| tree | 30307d736adb065bbe175560f7d6f8528d552673 | |
| parent | 83711e9bdf47d020d44997b74e1d24995130b992 [diff] | |
| parent | 43052a14c1412893ae76253f1323a41769d09b07 [diff] |
merge 3.4 (#22788)