]> granicus.if.org Git - php/commit
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)
commit27f6b8864e8506d3adca32810e350a132150ed03
tree78008f28f4ab40da3310b7867c7504a884ff38e5
parentc174e4cd73cd16ce0b52ab66a90e97c476a444fe
parent46c20ecf0ac3eb311c354a1c598a369c3de328aa
Merge branch 'master' of git.php.net:php-src

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