Merge branch 'master' into add-long-weakref
authorIvan Maidanski <ivmai@mail.ru>
Sun, 9 Dec 2012 18:41:54 +0000 (22:41 +0400)
committerIvan Maidanski <ivmai@mail.ru>
Sun, 9 Dec 2012 18:41:54 +0000 (22:41 +0400)
commit6e5f9a6eabc9c9f09770b51920d09827a23a4309
treebd8ab24c0a6adb7fae3ef634ec396bb57e10be6c
parent3939770d7751909cdef53c561b5604621e71fd0f
parent72092ed8dee8c64ee5b92a06a7628fae085d0cf2
Merge branch 'master' into add-long-weakref

Conflicts:
finalize.c
finalize.c
include/gc.h
tests/test.c