# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1461270954 14400
# Node ID 3d99ba3d08c1545ad15d3eed4b9bccc0327eee55
# Parent  59ebef9680eff6bc1a8893fe9064d53ef97a540e# Parent  cff44a19abfecebf8d3e181dcaf060ca445a1bc4
maint: merge stable to default.

diff -r 59ebef9680ef -r 3d99ba3d08c1 .hgtags
--- a/.hgtags	Wed Apr 20 15:54:37 2016 -0700
+++ b/.hgtags	Thu Apr 21 16:35:54 2016 -0400
@@ -100,3 +100,4 @@
 a58d5e6df908199c4aea83f78077b81289d2a0ad rc-4-0-1-3
 2b66f30a0de7a09801c2a3566021cde7e194d3d3 rc-4-0-1-4
 5162cdfb56d8e31ad00dc260a26d1c92c69c2acf release-4-0-1
+acaf1e137c5e6f201a6689a99a6568d0dfe9e9ed release-4-0-2
diff -r 59ebef9680ef -r 3d99ba3d08c1 configure.ac
diff -r 59ebef9680ef -r 3d99ba3d08c1 libinterp/module.mk
diff -r 59ebef9680ef -r 3d99ba3d08c1 liboctave/module.mk