]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Sat, 6 Dec 2014 11:31:55 +0000 (12:31 +0100)
committerAnatol Belski <ab@php.net>
Sat, 6 Dec 2014 11:31:55 +0000 (12:31 +0100)
commit0854fd8b8114faa5bc4fa1736292525a5ecdea8b
tree6b0c74078098dc64da0326c2013200d53670446d
parent08241ee3f3624d9fa9be21739a5e5cde28c24d0a
parent5d126245a3bb71b167a3b02a9d874c9247b556ff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed test