]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 10 May 2015 01:56:25 +0000 (18:56 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 10 May 2015 01:57:18 +0000 (18:57 -0700)
commit33594b78ec533127282a542d1e78b62df9e2dd4f
treed10d8e2e15443c74c5e632e73d2246f88062ade3
parent329513c3a75c5aba7a7f04cd21325132f7104d06
parent473ec539a1c3d242c8b171dd6a5a98fa17e05c13
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #48147 - implement manual handling of  //IGNORE for broken libc
NEWS
ext/iconv/iconv.c