]> granicus.if.org Git - php/commit
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)
commit69b2570b72a643f28135ebaf89ab1188d6cd7d45
tree8af49760bb791926beec56b167d7d7598cf21aa8
parent7cccb6bc5a377bdd91321202e4970dfaf394c60b
parent381edb425e16bd5d472c84d757465aa42cb39d0f
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
  updated the NEWS with the latest fileinfo changes

Conflicts:
NEWS