]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Sat, 6 Dec 2014 19:51:41 +0000 (20:51 +0100)
committerAnatol Belski <ab@php.net>
Sat, 6 Dec 2014 19:51:41 +0000 (20:51 +0100)
* PHP-5.6:
  Fixed bug #68398 msooxml matches too many archives


Trivial merge