]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 22 May 2013 06:26:23 +0000 (23:26 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 22 May 2013 06:26:23 +0000 (23:26 -0700)
commitf5fcb591ccab6f801f727cc9034bceacd7dd034c
tree68ea981b3b24d9b19d8e7ad67547f7ff4b1a254d
parent4f46a40b9df80ef3faf498262c7a06a77ee98041
parent0776337e28b87fee749de5fd359cccdc23353aca
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  merge NEWS from 5.3
  fix order