From: Anatol Belski Date: Fri, 19 Sep 2014 18:15:56 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: POST_NATIVE_TLS_MERGE^2~179 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6c02239caa84b0cf0ed1ce3fecc87cd0008e413;p=php Merge branch 'PHP-5.6' * PHP-5.6: fix possible array underflow Conflicts: ext/standard/image.c --- f6c02239caa84b0cf0ed1ce3fecc87cd0008e413