From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Wed, 6 Nov 2013 09:46:34 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6~12^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91108818e1554ed542a13148e6d8b79e29e77935;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/spl/tests/SplFileObject_rewind_error001.phpt
---

91108818e1554ed542a13148e6d8b79e29e77935