]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Tue, 31 Mar 2015 13:57:44 +0000 (15:57 +0200)
committerJulien Pauli <jpauli@php.net>
Tue, 31 Mar 2015 13:57:44 +0000 (15:57 +0200)
* PHP-5.5:
  5.5.25 now


Trivial merge