]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 333539b 099b295)
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)
* '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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.