tree f58596deb05bfdf83a0e20e52bb7b50dd38a40e8
parent 89e5671be7f2d66c6b3e9e0a41531b3c1dc7efd2
parent e12675a0f2a57ebd74a90400454c5dbdbc92882e
author Georg Brandl <georg@python.org> 1393141560 +0100
committer Georg Brandl <georg@python.org> 1393141560 +0100

merge