]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af13dde 2d386db)
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Fri, 24 May 2013 22:02:09 +0000 (00:02 +0200)
committerAnatol Belski <ab@php.net>
Fri, 24 May 2013 22:02:09 +0000 (00:02 +0200)
* PHP-5.4:
  Fixed bug #64916 finfo testcase contains copyrighted music.


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