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

2013-08-21 Thread Michael Wallner
Commit:618194859205c178a5359e60d8e156763036ddfd Author:Michael Wallner Wed, 21 Aug 2013 19:18:11 +0200 Parents: 83e3466898abcde99d0bd0b3dadc43b416e5cde6 d8023d13eb5c5c611a17b183b28c0a81233d8a1a Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdi

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

2013-06-25 Thread Felipe Pena
Commit:adb116dd485752cc765b8018907d9040b212becf Author:Felipe Pena Tue, 25 Jun 2013 18:00:42 -0300 Parents: d01ca1342c2487d6f825997eeac8aeddac4cf384 41b73e4cee9ce68b8b78a00eddd4322b0d48dd06 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h