| commit | 37e5d2c16410d9f6fa3c4ba02807221561c27d19 | [log] [tgz] |
|---|---|---|
| author | Martin Panter <vadmium+py@gmail.com> | Mon Sep 28 06:28:29 2015 +0000 |
| committer | Martin Panter <vadmium+py@gmail.com> | Mon Sep 28 06:28:29 2015 +0000 |
| tree | 21cfec1c779a69080a84785c37c4bc2f66480844 | |
| parent | bf4aee8ace3432ef5d36ba784214864a044f7498 [diff] | |
| parent | 2122b62c2aa69886b76bb0c68fbce48afae59d0f [diff] |
Merge from 3.4 into 3.5; no file changes