]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9959ead 9e3bc19)
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
authorAndrey Hristov <andrey@php.net>
Wed, 6 Aug 2014 13:59:56 +0000 (16:59 +0300)
committerAndrey Hristov <andrey@php.net>
Wed, 6 Aug 2014 13:59:56 +0000 (16:59 +0300)
Conflicts:
NEWS


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