# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1421955990 18000
# Node ID 18c213fa9b20f502484bd620ab2556830e9b0683
# Parent  3156773fcc809f49cc12dafbb8cf3f463f5e282a# Parent  7005044f3080e6f70650a4e29a9354df0b2b9ea2
maint: Periodic merge of stable to gui-release.

diff -r 3156773fcc80 -r 18c213fa9b20 libinterp/corefcn/toplev.cc
--- a/libinterp/corefcn/toplev.cc	Thu Jan 22 19:02:24 2015 +0100
+++ b/libinterp/corefcn/toplev.cc	Thu Jan 22 14:46:30 2015 -0500
@@ -831,7 +831,7 @@
 
   octave_stdout << "\n" << octave_name_version_and_copyright () << "\n\
 \n\
-GNU Octave free software; you can redistribute it and/or modify\n\
+GNU Octave is free software; you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\
 the Free Software Foundation; either version 3 of the License, or\n\
 (at your option) any later version.\n\