]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Wed, 26 Nov 2014 22:15:51 +0000 (23:15 +0100)
committerFerenc Kovacs <tyrael@php.net>
Wed, 26 Nov 2014 22:15:51 +0000 (23:15 +0100)
* PHP-5.6:
  #68446 is fixed


Trivial merge