]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Wed, 9 Sep 2015 23:53:57 +0000 (02:53 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 9 Sep 2015 23:53:57 +0000 (02:53 +0300)
* 'master' of git.php.net:php-src:
  Aligned IntlChar protos to their ARG_INFO (related to #70453)
  Skip IntlChar related test if ext/intl is not available


Trivial merge