Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Tue, 29 May 2012 14:43:20 +0000 (16:43 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 29 May 2012 14:43:20 +0000 (16:43 +0200)
commitc0e046a130c420b337960f7f54e3ff03e8b472ab
tree35b8b987df6d736942e1c350ea63412d0969be89
parentc4f9b01422e8aa892624e811b9b329519185bcb4
parentad0371ac7ecff5fedf1786c3aa720760f98c6269
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  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
ext/fileinfo/tests/finfo_open_error.phpt