]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9078c7 79ab514)
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Tue, 28 Jan 2014 13:57:48 +0000 (15:57 +0200)
committerAndrey Hristov <andrey@php.net>
Tue, 28 Jan 2014 13:57:48 +0000 (15:57 +0200)
Conflicts:
NEWS
UPGRADING


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