# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1360443540 18000
# Node ID fea72d94801364b1bde7cdf83237a49fe4db508a
# Parent  d69dfef8e8c69c9092ecf09902f6e7fa746e732e# Parent  0fb629c87fb59fc68da3ca2dfb149fe39502d08d
pull and merge upstream changes to default branch

diff --git a/ChangeLog b/ChangeLog
diff --git a/lib/stdio.in.h b/lib/stdio.in.h