tree abde23ee76b9a93bb49b680d1905bebd2113b6c9
parent 3c5c56f3c068bc13daea2275b951113b43a91e85
parent 56d3a03f706b54be307f7627db6d881eb851d2b1
author Georg Brandl <georg@python.org> 1395038211 +0100
committer Georg Brandl <georg@python.org> 1395038211 +0100

merge with 3.3