]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Wed, 27 Jun 2012 04:53:40 +0000 (21:53 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 27 Jun 2012 04:53:40 +0000 (21:53 -0700)
commitffcfa6f920f53d0b9e20883838307c08373712d5
tree91be15eb0c11932a1a761546db074315bd3a4810
parenta44a1dc194e60c51a4b7716f78f34a7dc334744b
parentad2bee193d9850cac9e214e9293f4dc3cd77d857
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  ws fix
  BFN
  Fix bug #62373 (serialize() generates wrong reference to the object)

Conflicts:
php.ini-development
php.ini-production