Coding style, ANSI C compatibility
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV.
Adding test for bug #63462
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Add a timestamp to the mail log.

This patch is loosely based on the one in bug #52126 but instead of
using a UNIX timestamp it uses the date format also being used by
error_log et al.
Add unit test for mail.log ini setting.
Merge branch 'PHP-5.5'
News entry for bug #52126
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
Merge branch 'master' of git.php.net:/php-src
fix windows build
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix windows build
  News entry for bug #52126

Conflicts:
	NEWS