]> granicus.if.org Git - python/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Fri, 11 Oct 2013 23:41:49 +0000 (01:41 +0200)
committerChristian Heimes <christian@cheimes.de>
Fri, 11 Oct 2013 23:41:49 +0000 (01:41 +0200)

Trivial merge