]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Thu, 2 Oct 2014 20:33:10 +0000 (22:33 +0200)
committerFerenc Kovacs <tyrael@php.net>
Thu, 2 Oct 2014 20:33:10 +0000 (22:33 +0200)
* PHP-5.6:
  we also have xz release tarballs since 5.5
  5.5.19 now

1  2 
.gitignore

diff --cc .gitignore
Simple merge