]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.4:
  Fix bug #63240 on stream_get_line()

1  2 
main/streams/streams.c

Simple merge