commit | 47b8ba22e304fa136563c803f5f0cc589e8be1ac | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Jan 20 22:25:06 2016 -0800 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Jan 20 22:25:06 2016 -0800 |
tree | ec367ffa5e950c78580061122983de29fe3d12b0 | |
parent | d4d7737c3f294d745d6c121dabb17b76cc11b9c8 [diff] | |
parent | c4032da2012d75c6c358f74d8bf9ee98a7fe8ecf [diff] |
merge 3.4 (#26171)