# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1360617968 18000
# Node ID 9bfbe785e72665033cee4840fc51870b33471480
# Parent  a1e67cf915ba4aaf5d5e24d193614b28fe7c3d77# Parent  f47b8b3e2442dadc70240ecdf02cbf7b1c87b9da
maint: periodic merge of stable to default

diff -r a1e67cf915ba -r 9bfbe785e726 .hgtags
--- a/.hgtags	Mon Feb 11 13:28:04 2013 -0500
+++ b/.hgtags	Mon Feb 11 16:26:08 2013 -0500
@@ -74,3 +74,4 @@
 faefa1bea8ddae3cab170afdeab68d3d15c4e623 ss-3-7-2
 0000000000000000000000000000000000000000 ss-3-7-2
 23a7661e529ae9bfc91693618f8c314c31f695ca ss-3-7-2
+cc5a7d1233f3acea85648baeb754fc0e8f225225 rc-3-6-4-2
diff -r a1e67cf915ba -r 9bfbe785e726 configure.ac
diff -r a1e67cf915ba -r 9bfbe785e726 scripts/optimization/sqp.m