]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1b0ae4 848df6f)
Merge branch 'PHP-5.6'
authorBob Weinand <bobwei9@hotmail.com>
Wed, 4 Jun 2014 00:20:35 +0000 (02:20 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Wed, 4 Jun 2014 00:20:35 +0000 (02:20 +0200)
Conflicts:
sapi/phpdbg/phpdbg.c


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