Merge remote-tracking branch 'php/master'

author Anatol Belski <ab@php.net>

Tue, 19 Aug 2014 10:56:29 +0000 (12:56 +0200)

committer Anatol Belski <ab@php.net>

Tue, 19 Aug 2014 10:56:29 +0000 (12:56 +0200)
author Anatol Belski <ab@php.net>
Tue, 19 Aug 2014 10:56:29 +0000 (12:56 +0200)
committer Anatol Belski <ab@php.net>
Tue, 19 Aug 2014 10:56:29 +0000 (12:56 +0200)
diff --cc ext/xsl/xsltprocessor.c
Simple merge
diff --cc main/network.c
Simple merge
author	Anatol Belski <ab@php.net>
	Tue, 19 Aug 2014 10:56:29 +0000 (12:56 +0200)
committer	Anatol Belski <ab@php.net>
	Tue, 19 Aug 2014 10:56:29 +0000 (12:56 +0200)
		1	2
ext/xsl/xsltprocessor.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/network.c	patch \|	diff1 \|	diff2 \|	blob \| history