]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Fri, 3 Jul 2015 09:17:16 +0000 (11:17 +0200)
committerAnatol Belski <ab@php.net>
Fri, 3 Jul 2015 09:17:16 +0000 (11:17 +0200)
* PHP-5.6:
  backport c01943bffc8b719e552d307f522820d50f783a4c into 5.6


Trivial merge