granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b278be8 cbe1597)

author	Sara Golemon <pollita@php.net>
	Tue, 19 Aug 2014 20:17:56 +0000 (13:17 -0700)
committer	Sara Golemon <pollita@php.net>
	Tue, 19 Aug 2014 20:17:56 +0000 (13:17 -0700)
commit	ac4569621dc8762862dca6d39adf4ceb39e7e00b
tree	80156e551ecaa966410095321693a9913e56259d	tree \| snapshot
parent	b278be894fcd0f2cbaee93e3f657f7f9beeb532f	commit \| diff
parent	cbe1597b747474388912c91018b0e12275784720	commit \| diff

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Switch use of strtok() to gd_strtok_r()

Conflicts:
NEWS

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