]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Tue, 26 Nov 2013 16:43:45 +0000 (17:43 +0100)
committerJulien Pauli <jpauli@php.net>
Tue, 26 Nov 2013 16:43:45 +0000 (17:43 +0100)
* PHP-5.5:
  Fixed a wrong test


Trivial merge