]> granicus.if.org Git - python/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Sat, 19 Oct 2013 17:56:27 +0000 (19:56 +0200)
committerChristian Heimes <christian@cheimes.de>
Sat, 19 Oct 2013 17:56:27 +0000 (19:56 +0200)

Trivial merge