]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff7e1ff c06ec6b)
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Thu, 19 Apr 2012 10:47:47 +0000 (12:47 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 19 Apr 2012 10:47:47 +0000 (12:47 +0200)
* PHP-5.3:
  Commit generated file
  Fix bug #61755 parsing bug can lead to access violations
  Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails


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