]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e675670 92bc49b)
Merge branch 'PHP-5.4'
authorFelipe Pena <felipensp@gmail.com>
Wed, 9 May 2012 00:06:15 +0000 (21:06 -0300)
committerFelipe Pena <felipensp@gmail.com>
Wed, 9 May 2012 00:06:15 +0000 (21:06 -0300)
* PHP-5.4:
  - Fixed bug #61978 (Object recursion not detected for classes that implement JsonSerializable)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.