]> granicus.if.org Git - python/commitdiff
Merge
authorChristian Heimes <christian@python.org>
Thu, 16 Apr 2015 18:26:19 +0000 (20:26 +0200)
committerChristian Heimes <christian@python.org>
Thu, 16 Apr 2015 18:26:19 +0000 (20:26 +0200)

Trivial merge