]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Fri, 26 Jun 2015 23:10:41 +0000 (01:10 +0200)
committerChristoph M. Becker <cmb@php.net>
Fri, 26 Jun 2015 23:10:41 +0000 (01:10 +0200)
* PHP-5.6:
  added regression test for bug #69679


Trivial merge