| commit | 7764f4d12c8aab5f017b67b624cd60f6b8c4909b | [log] [tgz] |
|---|---|---|
| author | Martin Panter <vadmium+py@gmail.com> | Wed Jun 08 12:45:30 2016 +0000 |
| committer | Martin Panter <vadmium+py@gmail.com> | Wed Jun 08 12:45:30 2016 +0000 |
| tree | 6e75d028bfda0807418a8c43ba3c4db6c72235c5 | |
| parent | 3c923eac4d88ef4714418aad691e0eaedf0afb47 [diff] | |
| parent | 7d7a11b5d700c54260c517d0fb57fe1caf591e31 [diff] |
Merge from 3.5; no changes to 3.6