]> granicus.if.org Git - python/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Tue, 29 Oct 2013 21:20:52 +0000 (22:20 +0100)
committerChristian Heimes <christian@cheimes.de>
Tue, 29 Oct 2013 21:20:52 +0000 (22:20 +0100)

Trivial merge