]> granicus.if.org Git - php/commit
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Thu, 3 Oct 2013 20:37:34 +0000 (13:37 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 3 Oct 2013 20:37:34 +0000 (13:37 -0700)
commit5d6087497c49bad6a623816ace9bb2faaaef42bc
tree01a421e28a09f475dd531525e2565395e66ba06e
parent333539b5fcddc9ee3a1018e5c90ee01a951bdf0b
parent099b295646b108ad56d1ec3b37dfcb5812fd378c
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  add NEWS and UPGRADING about gost-crypto
  fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency
  fix failing tests
  fix indention
  Add support for CryptoPro S-box for GOST