]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Sat, 7 Jun 2014 13:29:29 +0000 (15:29 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sat, 7 Jun 2014 13:29:29 +0000 (15:29 +0200)
* PHP-5.6:
  Fix bug #67392: token_name() does not return name for T_POW and T_POW_EQUAL token


Trivial merge