]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af94a01 a886a0c)
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Wed, 18 Jun 2014 18:54:26 +0000 (21:54 +0300)
committerAndrey Hristov <andrey@php.net>
Wed, 18 Jun 2014 18:54:26 +0000 (21:54 +0300)
Conflicts:
NEWS


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