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

Merge branch 'PHP-5.5' into PHP-5.6

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

ec89e6bfe2ddd9ed13547d5cb09dbdf3dbbb83b4