]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 94816ed dfc6feb)
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Thu, 29 Aug 2013 07:19:02 +0000 (11:19 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 29 Aug 2013 07:19:02 +0000 (11:19 +0400)
commit0f3977bc0fd31ee188ee50f44b130420812b93a9
treef8529a9a9001e6fccdc221994399a27d880d7ef3tree | snapshot
parent94816ed9bfe16bd1507a1abc708793e41c06ad79commit | diff
parentdfc6feb6e84f27094e6a2e3947caa094f7c35d26commit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)

Conflicts:
NEWS
NEWS diff1 | diff2 | blob | history
Zend/zend_API.c diff1 | diff2 | blob | history
Zend/zend_builtin_functions.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.