]> granicus.if.org Git - python/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Thu, 5 Sep 2013 14:06:46 +0000 (16:06 +0200)
committerChristian Heimes <christian@cheimes.de>
Thu, 5 Sep 2013 14:06:46 +0000 (16:06 +0200)

Trivial merge