]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorJohannes Schlüter <johannes@php.net>
Thu, 19 Apr 2012 10:49:47 +0000 (12:49 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 19 Apr 2012 10:49:47 +0000 (12:49 +0200)
* PHP-5.4:
  Commit generated file
  Fix bug #61755 parsing bug can lead to access violations


Trivial merge