]> granicus.if.org Git - python/commitdiff
merge 2.7
authorChristian Heimes <christian@cheimes.de>
Sat, 17 Aug 2013 13:02:55 +0000 (15:02 +0200)
committerChristian Heimes <christian@cheimes.de>
Sat, 17 Aug 2013 13:02:55 +0000 (15:02 +0200)

Trivial merge