Merge (dummy) remote-tracking branch 'pcpa/master'
authorIvan Maidanski <ivmai@mail.ru>
Sun, 15 Sep 2013 13:26:14 +0000 (17:26 +0400)
committerIvan Maidanski <ivmai@mail.ru>
Sun, 15 Sep 2013 13:26:14 +0000 (17:26 +0400)
commit1a428a37c25a99de7f901c5640aa985ea501b514
tree382f27573417efefe090577e3ef7f0b23b90cf49
parenta9b7a778ed00c93c0efc328f2ecfad726b29dfbd
parent460b6a0aa8ccebb0e918bbeab25c5e2da5ab01d4
Merge (dummy) remote-tracking branch 'pcpa/master'

Conflicts:
    include/gc_mark.h
    include/private/gc_priv.h
    mark.c
    os_dep.c