]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorMatteo Beccati <mbeccati@php.net>
Sat, 29 Aug 2015 08:48:53 +0000 (10:48 +0200)
committerMatteo Beccati <mbeccati@php.net>
Sat, 29 Aug 2015 08:48:53 +0000 (10:48 +0200)
commitcb5582d3c178119bcd5f8a1d0e2a5f2f90970908
tree5d0aa05b0e5506987e8b8382eec1a3bdd2c2e693
parent6b3e44369dd205152c0486ba30cd3a24b6a6c8e0
parent9d816f1bcf973e5e68f080f185616facb53ac23f
Merge branch 'PHP-5.6'

* PHP-5.6:
  Added missing skipif for phar+zlib test