Merge branch 'PHP-5.4' into PHP-5.5

author Michael Wallner <mike@php.net>

Fri, 6 Dec 2013 09:33:10 +0000 (10:33 +0100)

committer Michael Wallner <mike@php.net>

Fri, 6 Dec 2013 09:33:10 +0000 (10:33 +0100)
author Michael Wallner <mike@php.net>
Fri, 6 Dec 2013 09:33:10 +0000 (10:33 +0100)
committer Michael Wallner <mike@php.net>
Fri, 6 Dec 2013 09:33:10 +0000 (10:33 +0100)
diff --cc ext/dom/document.c
Simple merge
diff --cc main/streams/plain_wrapper.c
Simple merge
author	Michael Wallner <mike@php.net>
	Fri, 6 Dec 2013 09:33:10 +0000 (10:33 +0100)
committer	Michael Wallner <mike@php.net>
	Fri, 6 Dec 2013 09:33:10 +0000 (10:33 +0100)
		1	2
ext/dom/document.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/streams/plain_wrapper.c	patch \|	diff1 \|	diff2 \|	blob \| history