]> granicus.if.org Git - python/commitdiff
Merge
authorKristján Valur Jónsson <sweskman@gmail.com>
Sat, 12 Sep 2015 16:41:22 +0000 (16:41 +0000)
committerKristján Valur Jónsson <sweskman@gmail.com>
Sat, 12 Sep 2015 16:41:22 +0000 (16:41 +0000)

Trivial merge