[Guile-commits] 02/19: Merge commit '5af307de43e4b65eec7f235b48a8908f2a00f134'

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 678995ff79be5c705c752ed2687c616c06da3a40
Merge: 24d4f02 5af307d
Author: Andy Wingo <address@hidden>
Date:   Thu Jan 22 12:50:18 2015 +0100

    Merge commit '5af307de43e4b65eec7f235b48a8908f2a00f134'
    
    Conflicts:
        test-suite/tests/reader.test

 doc/ref/api-data.texi        |    8 ++++++--
 libguile/read.c              |    7 +++++--
 test-suite/tests/reader.test |    9 +++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --cc test-suite/tests/reader.test
index d9cb1c8,9055e3b..5eb368d
--- a/test-suite/tests/reader.test
+++ b/test-suite/tests/reader.test
@@@ -1,7 -1,8 +1,8 @@@
  ;;;; reader.test --- Reader test.    -*- coding: iso-8859-1; mode: scheme -*-
  ;;;;
- ;;;; Copyright (C) 1999, 2001, 2002, 2003, 2007, 2008, 2009, 2010, 2011,
- ;;;;   2013, 2014 Free Software Foundation, Inc.
 -;;;; Copyright (C) 1999, 2001-2003, 2007-2011, 2014
++;;;; Copyright (C) 1999, 2001-2003, 2007-2011, 2013-2015
+ ;;;;   Free Software Foundation, Inc.
+ ;;;;
  ;;;; Jim Blandy <address@hidden>
  ;;;;
  ;;;; This library is free software; you can redistribute it and/or