]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorYasuo Ohgaki <yohgaki@php.net>
Mon, 18 Jan 2016 01:52:11 +0000 (10:52 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Mon, 18 Jan 2016 01:52:11 +0000 (10:52 +0900)
commit7554478a4c8c2844ffacb124256dfff777f0f44d
treec083a7e8f2f95ec2e18169a34439dfac08ab584a
parent069522d4948b2dccc14b95e8e2e3239c435b2c9c
parentdc23f1f38f649f9a42ebd70e7301462779f82935
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c