]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 27 Nov 2014 12:39:23 +0000 (13:39 +0100)
committerAnatol Belski <ab@php.net>
Thu, 27 Nov 2014 12:39:23 +0000 (13:39 +0100)
* PHP-5.5:
  refactored the mbstring config.w32
  Fixed bug #68504 --with-libmbfl configure option not present on Windows


Trivial merge