]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Thu, 11 Jun 2015 08:52:39 +0000 (01:52 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 11 Jun 2015 08:52:39 +0000 (01:52 -0700)
commitf69e5d3b19bc0b0980bf0b05dfdfe75786967919
tree062b43d453250f9cbee3e969558b2b1b3df5583f
parent141f0ca18cd0dd3846cd5e36e59a798e70fc6a6e
parent9d162550ac7539420ccae0ffbfbe810b34744c33
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix bad copypaste
ext/iconv/config.m4