]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Fri, 12 Oct 2012 18:24:28 +0000 (20:24 +0200)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Fri, 12 Oct 2012 18:24:28 +0000 (20:24 +0200)
commit2634f55992f28e95fe6ee41a40b9ede56639c1ce
tree392696c7040d7f8efdfa8fcb218ce7d87f130e5d
parent1d87ad89b24d8a1b992cb2dbc770fac6cfcc1fcb
parentf8e26d95f27779276a2dcf9d3aefb6b2b604ba63
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #63240 on stream_get_line()
main/streams/streams.c