From: Christopher Jones <sixd@php.net>
Date: Thu, 3 Oct 2013 20:37:34 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-5.6.0alpha1~211^2~31^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d6087497c49bad6a623816ace9bb2faaaef42bc;p=php

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
---

5d6087497c49bad6a623816ace9bb2faaaef42bc