]> granicus.if.org Git - python/commitdiff
Merge heads
authorZachary Ware <zachary.ware@gmail.com>
Mon, 13 Apr 2015 15:51:37 +0000 (10:51 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Mon, 13 Apr 2015 15:51:37 +0000 (10:51 -0500)

Trivial merge