]> granicus.if.org Git - python/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Sun, 24 Nov 2013 00:12:22 +0000 (01:12 +0100)
committerChristian Heimes <christian@cheimes.de>
Sun, 24 Nov 2013 00:12:22 +0000 (01:12 +0100)

Trivial merge