granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4d43e2e c6f2581)

author	Anatol Belski <ab@php.net>
	Tue, 21 Jan 2014 16:14:56 +0000 (17:14 +0100)
committer	Anatol Belski <ab@php.net>
	Tue, 21 Jan 2014 16:14:56 +0000 (17:14 +0100)
commit	6e3fae4390c4fa9ae2ded001d72ebed158fcae7a
tree	25927f0dc8b3afff1336da7b91291120c782053d	tree \| snapshot
parent	4d43e2efdb2760d4b131903fd86eb44218a26c9b	commit \| diff
parent	c6f2581c39a651ce812e77d4901289910816930d	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fixed post deactivate signature in ext\libxml

ext/libxml/libxml.c

Unnamed repository; edit this file 'description' to name the repository.