]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 7 Jul 2014 07:50:15 +0000 (00:50 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 7 Jul 2014 07:50:15 +0000 (00:50 -0700)
* PHP-5.6:
  Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
  fix format


Trivial merge