[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/file.c

[Andrey Hristov]

Commit:    22ba2b95ce840fb0cc29acac9a1f6240a17c0c08
Author:    Andrey Hristov <and...@php.net>         Tue, 15 Jan 2013 11:06:59 
+0100
Parents:   dc495bbe95680a9cf2321da83a382d834d70758c 
83864b470b030a7d1bd0a1b46d3be75ce301304c
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=22ba2b95ce840fb0cc29acac9a1f6240a17c0c08

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
        NEWS

Changed paths:
  MM  ext/standard/file.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php