merge with 1.12

diff --git a/lib/linebuffer.h b/lib/linebuffer.h
index 5c73951..70781de 100644 (file)
--- a/lib/linebuffer.h
+++ b/lib/linebuffer.h
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 \f
 /* A `struct linebuffer' holds a line of text. */