From: Stanislav Malyshev <stas@php.net>
Date: Mon, 7 Jul 2014 07:38:50 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~119
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff52eac5f040df70d937f8da82d1295b1619ae1e;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
  Make sure the generator script also creates a newline at the end of file
  Add newline at end of file to prevent compilation warning
---

ff52eac5f040df70d937f8da82d1295b1619ae1e