commit | fc2fb0f62197ada0dec658dbd3ae44fcd7fcb938 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Sep 20 23:18:51 2015 +0500 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Sep 20 23:18:51 2015 +0500 |
tree | 30c761960c3df57a63edc52700ef28c5ea88f473 | |
parent | 86eb7300af07c2981ca8728ca1a36b518d47b3ac [diff] | |
parent | 16ad5cfad391a8e7c124ccaa984a56ad123d0ab2 [diff] |
merge 3.4 (#25145)