]> granicus.if.org Git - php/commit
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)
commitaa52fcf179d9e233075e4d213d5708cc5b5e1ae2
tree750277e51a75e5476e4d2cf688b2199045cfeb7b
parent7be91dd730e4e832d46868d63a5f5e5a978cadfc
parent41a2f7074dabe6e702d4ce300c86894bfae1d4b1
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #68398 msooxml matches too many archives