From: Anatol Belski Date: Tue, 19 Aug 2014 10:56:29 +0000 (+0200) Subject: Merge remote-tracking branch 'php/master' X-Git-Tag: POST_64BIT_BRANCH_MERGE^2~86 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40912abf1d8203cc7899888713594f54a82cf004;p=php Merge remote-tracking branch 'php/master' Conflicts: ext/xsl/xsltprocessor.c --- 40912abf1d8203cc7899888713594f54a82cf004