Ferenc Kovacs 2d26a7cf62 Merge branch 'PHP-5.6' ...

* PHP-5.6:
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"

2014-06-30 18:39:31 +02:00

..

aolserver

Bump year

2014-01-03 11:08:10 +08:00

apache

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

apache2filter

Merge branch 'PHP-5.6'

2014-03-24 17:53:08 +01:00

apache2handler

Merge branch 'PHP-5.6'

2014-04-13 15:40:21 -07:00

apache_hooks

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

caudium

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

cgi

Merge branch 'PHP-5.6'

2014-04-11 19:35:11 +02:00

cli

Merge branch 'PHP-5.6'

2014-06-18 00:21:20 +03:00

continuity

Update copyright year to 2014

2014-06-18 00:22:16 +03:00

embed

Merge branch 'PHP-5.6'

2014-03-24 10:32:07 +01:00

fpm

Merge branch 'PHP-5.6'

2014-06-30 18:39:31 +02:00

isapi

Bump year

2014-01-03 11:08:10 +08:00

litespeed

Merge branch 'PHP-5.6'

2014-04-22 10:49:18 -03:00

milter

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

nsapi

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

phpdbg

Merge sapi/phpdbg into PHP-5.6

2014-06-29 12:49:10 +02:00

phttpd

Bump year

2014-01-03 11:08:10 +08:00

pi3web

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

roxen

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

tests

- Rewrite scanner to be based on re2c instead of flex

2008-03-16 21:06:55 +00:00

thttpd

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

tux

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

webjames

Bump year

2014-01-03 11:08:10 +08:00