]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cccb6b 381edb4)
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Wed, 4 Apr 2012 16:54:03 +0000 (18:54 +0200)
committerAnatoliy Belsky <ab@php.net>
Wed, 4 Apr 2012 16:54:03 +0000 (18:54 +0200)
* PHP-5.3:
  Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
  updated the NEWS with the latest fileinfo changes

Conflicts:
NEWS


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