]> granicus.if.org Git - python/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Sat, 6 Oct 2012 15:14:02 +0000 (17:14 +0200)
committerChristian Heimes <christian@cheimes.de>
Sat, 6 Oct 2012 15:14:02 +0000 (17:14 +0200)

Trivial merge