]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit
- fix merge conflict
authordoko@ubuntu.com <doko@ubuntu.com>
Thu, 17 Apr 2014 16:46:53 +0000 (18:46 +0200)
committerdoko@ubuntu.com <doko@ubuntu.com>
Thu, 17 Apr 2014 16:46:53 +0000 (18:46 +0200)
commit72f61de768dc17ad528e1b3c01a87998eff22cac
tree14714ddf39589ce23245cd394e889c3a54c9d14e
parent2273ab2a0df96b96b7a5794537ca78a13129e3c4
- fix merge conflict
Misc/NEWS