]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Fri, 13 Sep 2013 23:44:10 +0000 (16:44 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 13 Sep 2013 23:44:10 +0000 (16:44 -0700)
# By Nikita Popov
# Via Nikita Popov
* 'master' of https://git.php.net/repository/php-src:
  Fix intl build


Trivial merge