granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d7b01af 4e7b31a)

author	Sara Golemon <sgolemon@fb.com>
	Fri, 3 Oct 2014 01:55:14 +0000 (18:55 -0700)
committer	Sara Golemon <sgolemon@fb.com>
	Fri, 3 Oct 2014 01:55:14 +0000 (18:55 -0700)
commit	2cf94189a2ff97874469b7c0027713aaab7d74b1
tree	6c5f2734bd454bf65cb92f1ebc3e1fb17ff0b4f7	tree \| snapshot
parent	d7b01aff89bab42c6672b3a432983137fae8a0ab	commit \| diff
parent	4e7b31a0dbe47d9218ff6a30f50121ddb612ce19	commit \| diff

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Add hash to EXTENSIONS file

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