]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'origin/PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Wed, 24 Jun 2015 22:23:21 +0000 (00:23 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 24 Jun 2015 22:23:21 +0000 (00:23 +0200)
* origin/PHP-5.6:
  5.6.12 next


Trivial merge