]> granicus.if.org Git - php/commit
Merge branch 'master' into test
authorDmitry Stogov <dmitry@zend.com>
Mon, 30 Jun 2014 20:22:05 +0000 (00:22 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 30 Jun 2014 20:22:05 +0000 (00:22 +0400)
commitfd62771fe5f209790c292c8917e8ee0b6053c283
tree864880e2344a3c75b1bcf9776ddbcb8215f9fd8e
parentacfbb7b6dcfdf868b2c709a105dbd32fbf60eccb
parent8c9b3e664c942fabbc46fc6ab4d6fa6594b1d213
Merge branch 'master' into test

* master:
  Fixed possible crash because of race conditions on modifying constants in shared memory