commit | 1f315835662d111adaf6df8652c59185fb863dc3 | [log] [tgz] |
---|---|---|
author | Georg Brandl <georg@python.org> | Thu Oct 02 12:35:54 2014 +0200 |
committer | Georg Brandl <georg@python.org> | Thu Oct 02 12:35:54 2014 +0200 |
tree | 4ed1f559f510bcb81c71be05f519cae170ebf25e | |
parent | df77518d8cb9d4bdec1fb8f84ccd73ffd2643067 [diff] | |
parent | 529452926b25f0461cc4a1da4ab85f0e6fdd661b [diff] |
merge 3.4