]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorSara Golemon <pollita@php.net>
Sun, 19 May 2013 20:35:03 +0000 (13:35 -0700)
committerSara Golemon <pollita@php.net>
Sun, 19 May 2013 20:35:03 +0000 (13:35 -0700)
commit4f46a40b9df80ef3faf498262c7a06a77ee98041
tree68ea981b3b24d9b19d8e7ad67547f7ff4b1a254d
parent4840ff0f05876ee614d17804d2340f2233eb4111
parent2d7415a4af66e0771b36a10534e304fe7af4a855
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Don't double-quote name of namespaced function.
Zend/zend_API.h