]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Fri, 29 Nov 2013 08:55:11 +0000 (12:55 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 29 Nov 2013 08:55:11 +0000 (12:55 +0400)
commit2cb0e1e4c13ec9e392bfc566f59a22de1013d571
treeb21da25b993ad2c27dcb8658b996e13b57d2e26d
parentf54f308f71edb6c0db679e1d6755af5e9cac2d56
parent967abd61537a2c7d0beebac9039aa068d518e4eb
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Added validation of class names in the autoload process

Conflicts:
NEWS
Zend/zend_execute_API.c