tree 39b9879d172c3fd25b09b8b100cf05d29aecf264
parent e7f4c1c045b075410e97d71a7f3db9e88866dce2
parent bc75046bb3a8bd1e07547e99c8958c54ec16b9fb
author Georg Brandl <georg@python.org> 1379142669 +0200
committer Georg Brandl <georg@python.org> 1379142669 +0200

merge with 3.2