David Soria Parra 6e7284fb5b Merge branch 'PHP-5.4' ... * PHP-5.4: Replace $Revision$ with $Id$ in keyword expansion enable files Enable $Id$ expansion for files with the $Revision$ keyword Conflicts: ext/mysqlnd/mysqlnd.h		2012-03-20 17:59:33 +01:00
..
aolserver
apache
apache2filter
apache2handler
apache_hooks
caudium
cgi
cli	Minor change, test using php mail address as account	2012-03-20 15:41:43 +08:00
continuity	Merge branch 'PHP-5.3' into PHP-5.4	2012-03-20 17:58:58 +01:00
embed
fpm	Merge branch '53' into 54	2012-03-19 13:10:53 -04:00
isapi
litespeed
milter
nsapi	Merge branch 'PHP-5.3' into PHP-5.4	2012-03-20 17:58:58 +01:00
phttpd
pi3web
roxen
tests
thttpd
tux
webjames