]> granicus.if.org Git - python/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Sun, 7 Oct 2012 20:45:14 +0000 (22:45 +0200)
committerChristian Heimes <christian@cheimes.de>
Sun, 7 Oct 2012 20:45:14 +0000 (22:45 +0200)

Trivial merge