]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Sun, 22 Apr 2012 17:29:52 +0000 (19:29 +0200)
committerAnatoliy Belsky <ab@php.net>
Sun, 22 Apr 2012 17:29:52 +0000 (19:29 +0200)
* PHP-5.3:
  Fix bug #61811 three of finfo tests failed, see also #61812.


Trivial merge