]> granicus.if.org Git - python/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Mon, 10 Sep 2012 11:19:15 +0000 (13:19 +0200)
committerChristian Heimes <christian@cheimes.de>
Mon, 10 Sep 2012 11:19:15 +0000 (13:19 +0200)

Trivial merge