]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' PHP-5.4
authorMatteo Beccati <mbeccati@php.net>
Sat, 29 Aug 2015 08:48:53 +0000 (10:48 +0200)
committerJulien Pauli <jpauli@php.net>
Wed, 2 Sep 2015 15:53:36 +0000 (17:53 +0200)
commita12cef979db2466dd98d46cffd0a32c6eb2957c3
treebc70346a5fa0f190b14bfb64435ca5c6d38289e9
parent51fca4b77d05cde26cfa59f54bf79fd97973c79a
Merge branch 'PHP-5.6'

* PHP-5.6:
  Added missing skipif for phar+zlib test
ext/phar/tests/bug70019.phpt