]> granicus.if.org Git - php/commitdiff
Merge branch 'fix-bug61115-1.phpt-for-no-debug' into PHP-5.3
authorChristopher Jones <sixd@php.net>
Tue, 1 May 2012 21:33:57 +0000 (14:33 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 1 May 2012 21:33:57 +0000 (14:33 -0700)
* fix-bug61115-1.phpt-for-no-debug:
  Fix masking in bug61115-1.phpt


Trivial merge