Move the JSON bugfix into the 5.5.6 changelog.
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	NEWS
Merge branch 'PHP-5.6'
Fix Bug #65714 	PHP cli forces the tty to cooked mode

Only drop the using_history() call with libedit as I don't know
if it is required with readline.

This also allow to run a php script in background without
it being aborted on first output.
NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fix Bug #65714 	PHP cli forces the tty to cooked mode
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  Fix Bug #65714 	PHP cli forces the tty to cooked mode
This is CLI web server change.  Added some common MIME types to the
existing lookup list, pending a more thorough lookup solution, if
anyone wants to do that.  Ref http://news.php.net/php.internals/69990

A router can be used to add to, or override, the MIME type lookups,
see http://php.net/manual/en/features.commandline.webserver.php
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  This is CLI web server change.  Added some common MIME types to the existing lookup list, pending a more thorough lookup solution, if anyone wants to do that.  Ref http://news.php.net/php.internals/69990
Update NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update NEWS
  This is CLI web server change.  Added some common MIME types to the existing lookup list, pending a more thorough lookup solution, if anyone wants to do that.  Ref http://news.php.net/php.internals/69990
Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string)
Merge branch 'PHP-5.4' into PHP-5.5
Update NEWS
Merge branch 'PHP-5.5'
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'