]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Tue, 29 May 2012 14:43:40 +0000 (16:43 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 29 May 2012 14:43:40 +0000 (16:43 +0200)
commit3a35479e5915542477b87eee2481e746a4d24065
tree820e26929734edcd8ac6d150db84f0ba2722d7bf
parentdffbc98239a3d10250627a0b08eecce1d8f93460
parentc0e046a130c420b337960f7f54e3ff03e8b472ab
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
  Bug #62177 deactivate the linux test version on win
  Fix bug #62177 Test Bug - finfo_file_regex.phpt