From: Tjerk Meesters Date: Wed, 3 Dec 2014 23:22:54 +0000 (+0800) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~68 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e933c5ff89ae3dc8b48f94ad9c9a8bc77d93a25;p=php Merge branch 'PHP-5.6' * PHP-5.6: Fixed #65213 - cannot cast SplFileInfo to boolean Conflicts: ext/spl/spl_directory.c --- 7e933c5ff89ae3dc8b48f94ad9c9a8bc77d93a25