]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e590ace e2fc6b5)
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
authorPierre Joye <pierre.php@gmail.com>
Mon, 10 Mar 2014 11:04:04 +0000 (12:04 +0100)
committerPierre Joye <pierre.php@gmail.com>
Mon, 10 Mar 2014 11:04:04 +0000 (12:04 +0100)
commitcedc718f73fc6ea2f3164f31c6e8bd094ba0f917
tree9ecd171fc07cb9c751684a746186da31575f9559tree | snapshot
parente590aceb5ad05e59896fecfeb645f5a70919f417commit | diff
parente2fc6b52f04ce2bf2295011d8b768cc0d8097ed7commit | diff
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

# By Dmitry Panin (1) and Remi Collet (1)
# Via Nikita Popov
* 'PHP-5.4' of git.php.net:php-src:
  Fix HTML entity table generation
  Set default Digest Message to use SHA1 instead of MD5 in openssl tests as MD5 signature are now rejected by newer openssl Version.
Unnamed repository; edit this file 'description' to name the repository.