[Python-checkins] r75107 - python/branches/py3k/Objects/obmalloc.c

[Mark Dickinson]

On Mon, Sep 28, 2009 at 4:58 PM, kristjan.jonsson
<python-checkins at python.org> wrote:
> Author: kristjan.jonsson
> Date: Mon Sep 28 17:57:53 2009
> New Revision: 75107
>
> Log:
> merging revision 75106 from trunk:
> [...]

Kristján, in future, please could you use svnmerge when merging from
trunk to py3k
(or from trunk to release26-maint, or from py3k to release31-maint).
I've fixed these
recent checkins (75103, 75104, 75106).

Thanks,

Mark