]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
- merge heads
authordoko@ubuntu.com <doko@ubuntu.com>
Mon, 13 Apr 2015 19:48:44 +0000 (21:48 +0200)
committerdoko@ubuntu.com <doko@ubuntu.com>
Mon, 13 Apr 2015 19:48:44 +0000 (21:48 +0200)

Trivial merge