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

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 4247d8e34e410032a8a1f1fe036201c2be431090
Merge: 0a5b437 5b76323
Author: Andy Wingo <address@hidden>
Date:   Thu Jan 22 14:54:17 2015 +0100

    Merge commit '5b7632331e7551ac202bbaba37c572b96a791c6e'
    
    Conflicts:
        module/oop/goops.scm

 module/oop/goops.scm        |   39 ++++++++++++++++++++++++++-------------
 test-suite/tests/goops.test |   39 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 64 insertions(+), 14 deletions(-)

diff --cc module/oop/goops.scm
index 6afd049,9ab1eb2..95be42a
--- a/module/oop/goops.scm
+++ b/module/oop/goops.scm
@@@ -1,6 -1,6 +1,6 @@@
  ;;; installed-scm-file
  
- ;;;; Copyright (C) 1998,1999,2000,2001,2002, 2003, 2006, 2009, 2010, 2011, 
2013, 2014, 2015 Free Software Foundation, Inc.
 -;;;; Copyright (C) 1998,1999,2000,2001,2002, 2003, 2006, 2009, 2010, 2011, 
2014, 2015 Free Software Foundation, Inc.
++;;;; Copyright (C) 1998,1999,2000-2003,2006,2009-2011,2013-2015 Free Software 
Foundation, Inc.
  ;;;; Copyright (C) 1993-1998 Erick Gallesio - I3S-CNRS/ESSI <address@hidden>
  ;;;;
  ;;;; This library is free software; you can redistribute it and/or