]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorSara Golemon <pollita@php.net>
Thu, 20 Feb 2014 20:10:40 +0000 (12:10 -0800)
committerSara Golemon <pollita@php.net>
Thu, 20 Feb 2014 20:10:40 +0000 (12:10 -0800)
commitd301c355402416f1d79d6c720943941a30381814
tree4f635da8c36c30cb6ad09fa30f5efce6529cfeec
parent7fab1a5790fbba5b186905ad2a12aa56d495fb16
parent14c08ea362e5f16527b3d9772ddc75ca49cc22d7
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add more tests for __debugInfo() and fix leak
Zend/zend_object_handlers.c