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

2012-12-11 Thread Adam Harvey
Commit:8bb106d20c8f36d814772c45d693af2b42b06732 Author:Adam Harvey Tue, 11 Dec 2012 19:53:02 +0800 Parents: ec83534d88da4c96777b86d8db7fd20a52ed012e 2d1694d4ebd51ab61f12e6bc545a17e3baf3b4a0 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=

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

2012-11-26 Thread Remi Collet
Commit:495ff0964d6c24f04f1d705334bb3a5ce49ea8cb Author:Remi Collet Mon, 26 Nov 2012 13:05:37 +0100 Parents: dfa5ca2b8dbaf0e4400dce8bcb156821aec384ce 7751a6882485de64365661f4e7918535c3992982 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=495ff09

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

2012-11-24 Thread Remi Collet
Commit:f4a8612561b5b446d563901a3f13edf9e6298267 Author:Remi Collet Sun, 25 Nov 2012 08:21:10 +0100 Parents: c5d4ee9bed992e1ac7f74be8ddfc0ae0c510df1e 289bb339c9e722ff3017ec58fdef7300f39b8e6d Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f4a8612