From: Stanislav Malyshev <stas@php.net>
Date: Tue, 24 Jun 2014 18:24:40 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~158
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b304a56685994c5dbfe00892bd73e5e1f3c2eb90;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  remove bug67072_2 test for 5.6+ since we'd have cleaner solution
  Fix test - because of big #67397 we don't allow overlong locales anymore
---

b304a56685994c5dbfe00892bd73e5e1f3c2eb90