commit | 8edd68f88bfe0f88addf4ba8e69bd920a7995b44 | [log] [tgz] |
---|---|---|
author | Paul Kehrer <paul.l.kehrer@gmail.com> | Tue Sep 15 18:57:32 2015 -0500 |
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | Tue Sep 15 18:57:32 2015 -0500 |
tree | 30cfa362a5440fe99de2ffd640f74856ca703d53 | |
parent | 4e91f7f86436ffe8b1a2bebb4fe1ee74e7824c2c [diff] | |
parent | 4e4bdb093b9038bd6896f234ac35387505e5f346 [diff] |
Merge branch 'master' into py35-and-pypy