]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 23:14:32 +0000 (16:14 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 23:14:32 +0000 (16:14 -0700)
commit54daa5317f8af16ca7a14ae7a66c00ddd87a6e70
tree669b12dc15359e021c52be574f4ea0a5c51dff45
parent97047e7665368d0cf30501f7a4b6a124de25957b
parent568a35f84f934d1fe1b9817b4226cf2bd9d8f4cc
Merge branch 'PHP-5.6'

* PHP-5.6:
  __wakeup doesn't have to be final
Zend/zend_exceptions.c