]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Tue, 30 Dec 2014 18:41:07 +0000 (19:41 +0100)
committerAnatol Belski <ab@php.net>
Tue, 30 Dec 2014 18:41:07 +0000 (19:41 +0100)
commita78eaddbe00d5832ccca8d48a745e1d36e67874c
tree721009abb78fe82b36b631f0953f657d37fa656f
parent2d561e0e26a511225ffafb25020c4931c6c17ae4
parent85b4a6552029b1f3fdb39251f37986fafcb958a1
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fixed bug #68671 incorrect expression in libmagic

Conflicts:
ext/fileinfo/libmagic/print.c
ext/fileinfo/libmagic/print.c