]> granicus.if.org Git - python/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Sat, 23 Nov 2013 20:14:01 +0000 (21:14 +0100)
committerChristian Heimes <christian@cheimes.de>
Sat, 23 Nov 2013 20:14:01 +0000 (21:14 +0100)

Trivial merge