projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5ce11c2 d184f07)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 27 May 2014 01:05:59 +0000 (18:05 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 27 May 2014 01:06:15 +0000 (18:06 -0700)
commit076c25bfec126a431de574e4bad8df053ba50374
treeb4881e01f394c4c9f5cb6735479799921c4dd11atree | snapshot
parent5ce11c2698ac944cb1e78ce50c2e7bfe3719303fcommit | diff
parentd184f07b3ccc30113ae11dd68f987f6cefe36d79commit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  backport this piece from 5.6, related to the #66307 fix
  Fixed bug #66307 Fileinfo crashes with powerpoint files
NEWS diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.