]> granicus.if.org Git - python/commitdiff
Merge
authorJason R. Coombs <jaraco@jaraco.com>
Sun, 10 Nov 2013 19:02:40 +0000 (14:02 -0500)
committerJason R. Coombs <jaraco@jaraco.com>
Sun, 10 Nov 2013 19:02:40 +0000 (14:02 -0500)

Trivial merge