com php-src: Merge branch 'PHP-5.4':
| From: | David Soria Parra | Date: | Tue, 20 Mar 2012 16:31:29 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4': | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-68066@lists.php.net to get a copy of this message | ||
Commit: 1dcb81c14c41142b41b2c18fd7fc3acbceb6e3cd
Author: David Soria Parra <dsp@php.net> Tue, 20 Mar 2012 17:31:29 +0100
Parents: a0c87ff53c2226ecbf451bc7ef1648ec84edb320 71d894cd421d96517618e9d33dfea640499c8ffd
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1dcb81c14c41142b41b2c18fd7fc3acbceb6e3cd
Log:
Merge branch 'PHP-5.4'
* PHP-5.4:
Adding Braces in json.c to conform with coding standards
Trivial merge