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

Trivial merge