]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Thu, 21 May 2015 12:07:14 +0000 (14:07 +0200)
committerRemi Collet <remi@php.net>
Thu, 21 May 2015 12:07:14 +0000 (14:07 +0200)
* PHP-5.6:
  NEWS
  Fixed bug #69680 (phar symlink in binary directory broken).
  Make the phar symlink relative

1  2 
ext/phar/Makefile.frag

Simple merge