update year & copyright
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Update LiteSpeed SAPI code to V6.4

Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapidef.h
	sapi/litespeed/lsapilib.c
	sapi/litespeed/lsapilib.h
update to LSAPI 6.6

Conflicts:
	sapi/litespeed/lsapi_main.c
Do not kill children process in pre-fork mode when parent process quit.
cleanup file headers.
Update LiteSpeed SAPI code to V6.4

Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapidef.h
	sapi/litespeed/lsapilib.c
	sapi/litespeed/lsapilib.h

Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapilib.c
	sapi/litespeed/lsapilib.h
update to LSAPI 6.6

Conflicts:
	sapi/litespeed/lsapi_main.c
Do not kill children process in pre-fork mode when parent process quit.
cleanup file headers.
force ext_dep.js prepend to configure.js in phpize mode
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  force ext_dep.js prepend to configure.js in phpize mode
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4
update to LSAPI 6.6

Conflicts:
	sapi/litespeed/lsapi_main.c
Do not kill children process in pre-fork mode when parent process quit.
cleanup file headers.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  force ext_dep.js prepend to configure.js in phpize mode
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4

Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapilib.c
Merge branch 'PHP-5.6'

* PHP-5.6:
  force ext_dep.js prepend to configure.js in phpize mode
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4
  update year & copyright

Conflicts:
	sapi/litespeed/lsapilib.h
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

Conflicts:
	sapi/litespeed/lsapilib.h
Merge branch 'PHP-5.6'

* PHP-5.6:
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6