# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1357433902 18000
# Node ID e2f98cc246bdb12f2d35366042d4aab61c3d54fe
# Parent  c960be36c9f3f690ceb43057314354e0df736416# Parent  7ebb2c82d76fcf8b572ace5a9037d828757a2d6d
maint: merge stable to default

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