]> granicus.if.org Git - python/commit
Fixed merge error.
authorSerhiy Storchaka <storchaka@gmail.com>
Fri, 4 Sep 2015 05:38:45 +0000 (08:38 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Fri, 4 Sep 2015 05:38:45 +0000 (08:38 +0300)
commit6e87576571b5d2decc7d3e554d1c3ce31e455145
tree5a69a2c3511ce6381b38ccdf2cc1578a034bcdd3
parent66d1865597e6a19cc2cd643b478059d11f80b061
Fixed merge error.
Misc/NEWS