]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' of http://git.php.net/repository/php-src into 54
authorIlia Alshanetsky <iliaal@php.net>
Mon, 19 Mar 2012 17:49:23 +0000 (13:49 -0400)
committerIlia Alshanetsky <iliaal@php.net>
Mon, 19 Mar 2012 17:49:23 +0000 (13:49 -0400)
commit69a016b50431a1dca2c42efceac5ce92803d7f67
treeea132911d67f9fff1c309967b0ea454d20273379
parent5709f7dd5bd6874257f7b0f49f90fc1ff627a918
parent260e77709ddfe9e72e2b7f11393673b6ee18a7f9
Merge branch 'PHP-5.4' of http://git.php.net/repository/php-src into 54

* 'PHP-5.4' of http://git.php.net/repository/php-src:
  fix tests failing due to corrected hash tiger