]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 10 May 2015 02:00:40 +0000 (19:00 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 10 May 2015 02:00:40 +0000 (19:00 -0700)
commit8c8889e7d470e0e20d2cab641c9833b4b3b8c6ac
treeec6c0bcba60165be85ed0de76dd9f77dffb1d75f
parent1ceacc813aecb07fbda18f8c63c7a76792886d3d
parent33594b78ec533127282a542d1e78b62df9e2dd4f
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #48147 - implement manual handling of  //IGNORE for broken libc

Conflicts:
ext/iconv/iconv.c