]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Thu, 10 Mar 2016 07:23:40 +0000 (15:23 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 10 Mar 2016 07:23:40 +0000 (15:23 +0800)
commit351201bc7b246f0ce793307113c598db5864fdd7
tree85c623ed5ce0f71d5018fd7ffee2f3c9c4822bec
parentc3cf6f2a682eb25d0a52bef77386f155115efc13
parent915a3762ef71526d6deddf95bf42a6d5bf5211f3
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed typo (partially fix for #71753)

Conflicts:
ext/standard/uuencode.c
ext/standard/uuencode.c