]> granicus.if.org Git - php/commit
Merge remote-tracking branch 'origin/master' into native-tls
authorAnatol Belski <ab@php.net>
Mon, 15 Dec 2014 06:13:09 +0000 (07:13 +0100)
committerAnatol Belski <ab@php.net>
Mon, 15 Dec 2014 06:13:09 +0000 (07:13 +0100)
commit61f90fbe0b5c20420661642085a13e596c8883e9
tree499eeeaa48ef882a74a9ffb13a2f743eea4be47e
parent5ff59f986c2037efa9d2af2d97e274078748450c
parent8f177fde907b632f7951f4939012bf1da4c77d15
Merge remote-tracking branch 'origin/master' into native-tls

* origin/master:
  Save 8 bytes on 64 bits

Conflicts:
Zend/zend_API.c
Zend/zend_API.c
Zend/zend_types.h