]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorJulien Pauli <jpauli@php.net>
Wed, 29 Apr 2015 09:22:05 +0000 (11:22 +0200)
committerJulien Pauli <jpauli@php.net>
Wed, 29 Apr 2015 09:22:05 +0000 (11:22 +0200)
* PHP-5.6:
  5.5.26 now


Trivial merge