]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc9893e 6477bb7)
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Mon, 16 Jan 2017 13:11:41 +0000 (14:11 +0100)
committerNikita Popov <nikic@php.net>
Mon, 16 Jan 2017 13:11:41 +0000 (14:11 +0100)

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