]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorFelipe Pena <felipensp@gmail.com>
Wed, 26 Jun 2013 00:19:06 +0000 (21:19 -0300)
committerFelipe Pena <felipensp@gmail.com>
Wed, 26 Jun 2013 00:19:06 +0000 (21:19 -0300)
* PHP-5.5:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN


Trivial merge