]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Wed, 2 Sep 2015 15:55:57 +0000 (17:55 +0200)
committerJulien Pauli <jpauli@php.net>
Wed, 2 Sep 2015 15:55:57 +0000 (17:55 +0200)
* PHP-5.5:
  Merge branch 'PHP-5.6'
  bump version


Trivial merge