]> granicus.if.org Git - php/commit
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)
commit964f65484c8bc2caba6ac9145fdf5e510cbf226a
tree0c63722bc1a3ddc23cb5e64c92205ba75c3c35f7
parent0e273217cfd1e72b5109a880fb4334edd2f61448
parent040194d6a03828cb178cf28467077fd0ddbec8d3
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed the test for ICI >= 52.1