]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/1930' into PHP-5.6
authorChristoph M. Becker <cmb@php.net>
Thu, 9 Jun 2016 13:28:58 +0000 (15:28 +0200)
committerChristoph M. Becker <cmb@php.net>
Thu, 9 Jun 2016 13:28:58 +0000 (15:28 +0200)

Trivial merge