]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 7 Apr 2014 15:41:32 +0000 (17:41 +0200)
committerAnatol Belski <ab@php.net>
Mon, 7 Apr 2014 15:41:32 +0000 (17:41 +0200)
* PHP-5.5:
  fixed the test for ICI >= 52.1


Trivial merge