]> granicus.if.org Git - python/commitdiff
Merge heads
authorÉric Araujo <merwok@netwok.org>
Thu, 13 Mar 2014 10:02:15 +0000 (06:02 -0400)
committerÉric Araujo <merwok@netwok.org>
Thu, 13 Mar 2014 10:02:15 +0000 (06:02 -0400)

Trivial merge