From: Anatol Belski <ab@php.net>
Date: Mon, 20 Oct 2014 13:54:33 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.3RC1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0b247bc87f0532979e7193b263eb454ce739a28;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  initialize lineno before calling compile file file in phar
  News entry for new curl constants
---

e0b247bc87f0532979e7193b263eb454ce739a28