From: Anatol Belski <ab@php.net>
Date: Thu, 9 Jan 2014 14:28:09 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~43^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f115c0b7d35bc6f5c522e2ac426871eabb64832;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed EOL in the test
---

4f115c0b7d35bc6f5c522e2ac426871eabb64832