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

[Xinchen Hui]

Commit:    140a42f779b83f5c32656741f9fd26f34edc0b1b
Author:    Xinchen Hui <larue...@php.net>         Sun, 17 Nov 2013 17:20:13 
+0800
Parents:   81d0ba10bac7bd2c4820374931ad8862cc434800 
5e9268f4694e917f991857839fac160d2954331f
Branches:  PHP-5.6 master

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

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

Changed paths:
  MM  ext/standard/basic_functions.c


Diff:



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