]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorAnatol Belski <ab@php.net>
Fri, 24 May 2013 22:02:34 +0000 (00:02 +0200)
committerAnatol Belski <ab@php.net>
Fri, 24 May 2013 22:02:34 +0000 (00:02 +0200)
* PHP-5.5:
  Fixed bug #64916 finfo testcase contains copyrighted music.


Trivial merge