From: Anatol Belski Date: Sat, 6 Dec 2014 19:51:41 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~42 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa52fcf179d9e233075e4d213d5708cc5b5e1ae2;p=php Merge branch 'PHP-5.6' * PHP-5.6: Fixed bug #68398 msooxml matches too many archives --- aa52fcf179d9e233075e4d213d5708cc5b5e1ae2