]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 23:13:43 +0000 (16:13 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 23:13:43 +0000 (16:13 -0700)
commitf2f8ea9ac53973a1ddb55ddc5eae3109d841309c
tree8fd13ecb77212cabcd78cfd17dc3fe89a1592661
parentd52c4857178cf30741905469c5a080bbdd973478
parentf1acac154ac7684bc908fc2ad8962372c9d4e312
Merge branch 'PHP-5.4' into PHP-5.5

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