]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 8 Jun 2014 20:53:01 +0000 (13:53 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 8 Jun 2014 20:53:01 +0000 (13:53 -0700)
commite35945490f6fc4bc6c3a7e42484d30eb7d544532
tree3c013063d8b2574c516d91620a261ea064a34e70
parent1e2a4a67dd4608e00a5cd548840fc92940cf9f45
parentda6abc8db4de42cb8dd4b6c7e13bce339c4b320f
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Remove superfluous echos.
ext/zlib/tests/gzseek_basic2.phpt
ext/zlib/tests/gzseek_variation1.phpt
ext/zlib/tests/gzseek_variation4.phpt
ext/zlib/tests/gzseek_variation5.phpt