Merge branch 'PHP-5.6' into PHP-7.02016-01-04T17:13:38+00:00Julien Paulijpauli@php.net2016-01-04T17:13:38+00:00736b91c6507b196e9ddd84aba3f98ee7ed66c63d
* PHP-5.6:
Happy new year (Update copyright to 2016)
Conflicts:
ext/json/php_json_encoder.h
sapi/continuity/capi.c
* PHP-5.6:
Happy new year (Update copyright to 2016)
Conflicts:
ext/json/php_json_encoder.h
sapi/continuity/capi.c
Happy new year (Update copyright to 2016)2016-01-02T23:44:37+00:00Lior Kaplankaplanlior@gmail.com2016-01-01T23:44:37+00:0053fb2f1e5c6037a5182c2e0dcd5bac7ecdb7c150
Happy new year (Update copyright to 2016)2016-01-01T18:03:16+00:00Lior Kaplankaplanlior@gmail.com2016-01-01T17:49:07+00:002eb1f38d24bcd02f69bfcf7845f93563a42850d6
Merge branch 'PHP-5.6' into PHP-7.02016-01-01T17:48:25+00:00Lior Kaplankaplanlior@gmail.com2016-01-01T17:47:16+00:00ed35de784f4ea53927e906ba4af335778de4d16a
* PHP-5.6:
Happy new year (Update copyright to 2016)
* PHP-5.6:
Happy new year (Update copyright to 2016)
Happy new year (Update copyright to 2016)2016-01-01T17:21:47+00:00Lior Kaplankaplanlior@gmail.com2016-01-01T17:19:27+00:0049493a2dcfb2cd1758b69b13d9006ead3be0e066
rather use the supplied inttypes.h with vc142015-10-23T07:47:00+00:00Anatol Belskiab@php.net2015-10-23T07:47:00+00:00448d1ce428cd14453b908fdf721eb008d445474a
pear 1.10 was released and the go-pear and install pear phars are now php7 compatible2015-10-07T11:56:47+00:00Ferenc Kovacstyrael@php.net2015-10-07T11:56:47+00:00f9e3461c02068c599ea9fbf6455860c8cc956bc6