]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Mon, 20 Oct 2014 13:55:05 +0000 (15:55 +0200)
committerAnatol Belski <ab@php.net>
Mon, 20 Oct 2014 13:55:05 +0000 (15:55 +0200)
commit7a1a0f39d011f4504de0d6458f2b64a5ca1be850
tree2f65fc29e418489fc62d2ba901481d447ae8ca78
parent0e270661a44ad2ff833b9ca33663a841e79886b6
parente0b247bc87f0532979e7193b263eb454ce739a28
Merge branch 'PHP-5.6'

* PHP-5.6:
  initialize lineno before calling compile file file in phar
  News entry for new curl constants
ext/phar/phar.c