]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Mon, 8 Apr 2013 10:50:25 +0000 (12:50 +0200)
committerAnatol Belski <ab@php.net>
Mon, 8 Apr 2013 10:50:25 +0000 (12:50 +0200)
* PHP-5.4:
  fix memory leak at apprentice.c:1095


Trivial merge