# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1361059138 18000
# Node ID 1a2f1001d07dfa98c1e78b6cf2256d057dee78b6
# Parent  f837bdd535f7ed61256610d011da13a7079889e9# Parent  9bfbe785e72665033cee4840fc51870b33471480
maint: merge away extra head on default

diff -r f837bdd535f7 -r 1a2f1001d07d .hgtags
--- a/.hgtags	Thu Feb 14 21:11:46 2013 +0100
+++ b/.hgtags	Sat Feb 16 18:58:58 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 f837bdd535f7 -r 1a2f1001d07d configure.ac
diff -r f837bdd535f7 -r 1a2f1001d07d scripts/optimization/sqp.m