summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-04-10 13:03:41 (GMT)
committerAnatoliy Belsky <ab@php.net>2012-04-10 13:03:41 (GMT)
commit98001a849b78bac675bf25664a305f9709bf7ec9 (patch)
tree26beae938ba0c092c408ae1488f98b25c5e90949
parent06b2d66ce259372883e0742be3930a3a10494261 (diff)
parentb9cbb9e744f3fadf7b87e9fe2b8058ad1036962b (diff)
downloadphp-98001a849b78bac675bf25664a305f9709bf7ec9.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Fix bug #61667 ext\standard\tests\file\glob_variation-win32.phpt fails Conflicts: ext/standard/tests/file/glob_variation-win32.phpt
0 files changed, 0 insertions, 0 deletions