]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorAnatoliy Belsky <ab@php.net>
Tue, 27 Nov 2012 15:14:00 +0000 (16:14 +0100)
committerAnatoliy Belsky <ab@php.net>
Tue, 27 Nov 2012 15:14:00 +0000 (16:14 +0100)
* PHP-5.5:
  This test isn't supposed to pass on windows


Trivial merge