]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 22 Jan 2014 14:40:58 +0000 (15:40 +0100)
committerAnatol Belski <ab@php.net>
Wed, 22 Jan 2014 14:40:58 +0000 (15:40 +0100)
commitf8e9f84a97e25a5401be80aceda6ec20a76fbcde
tree46e53441f7a7e6b27bc83c50fbbaff235a9459df
parentca27c86110e40f7a38baa196c20a0a3997ffefe8
parent0436b85d9f32e138922713cc913a4479b2cfa927
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed test