]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Wed, 15 Oct 2014 13:13:13 +0000 (21:13 +0800)
committerTjerk Meesters <datibbaw@php.net>
Wed, 15 Oct 2014 13:13:13 +0000 (21:13 +0800)
* PHP-5.6:
  Fixed bug #68234


Trivial merge