]> granicus.if.org Git - python/commitdiff
Merge heads.
authorMark Dickinson <dickinsm@gmail.com>
Sat, 13 Apr 2013 15:09:52 +0000 (16:09 +0100)
committerMark Dickinson <dickinsm@gmail.com>
Sat, 13 Apr 2013 15:09:52 +0000 (16:09 +0100)

Trivial merge