]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Wed, 5 Sep 2012 15:11:19 +0000 (23:11 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 5 Sep 2012 15:11:19 +0000 (23:11 +0800)
commit9d44ff640c1def1dc05b298dab77b2d2c9da2f38
treebc2dd089bc5c62fcfb22ddfc23c8e3732a08f880
parent954e7a3b3ca115b619b1b326ae4ae31a7cf196db
parentd64d9e335147173507d39c759c54320e2c20c9ed
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
ext/interbase/interbase.rc
ext/date/lib/parse_date.c
ext/date/lib/parse_iso_intervals.c
ext/dba/libflatfile/flatfile.c
ext/dba/libinifile/inifile.c
ext/standard/url_scanner_ex.c
sapi/cli/cli.h
sapi/fpm/fpm/fpm_main.c