# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1313422341 14400
# Node ID a4eb4d6bbd61015b3f8f8a62672a3e89ccef2999
# Parent  22bc9ec80c2c0acf2003461e2bbf27ff6c0b39d0# Parent  18797a4b61740a6e5040f8322f5689f376479e4b
maint: periodic merge of stable to default

diff --git a/src/oct-stream.cc b/src/oct-stream.cc