Merge commit 'ca5e0414e96886177d883a249edd957d2331db65'

Conflicts:
	module/language/tree-il/primitives.scm

diff --cc doc/ref/srfi-modules.texi
Simple merge

diff --cc module/Makefile.am
Simple merge

diff --cc module/language/tree-il/primitives.scm
index 84c07a0,f140eec..71437b2
--- 1/module/language/tree-il/primitives.scm
--- 2/module/language/tree-il/primitives.scm
+++ b/module/language/tree-il/primitives.scm
@@@ -1,6 -1,6 +1,6 @@@
  ;;; open-coding primitive procedures
  
- ;; Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 -;; Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
++;; Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
  
  ;;;; This library is free software; you can redistribute it and/or
  ;;;; modify it under the terms of the GNU Lesser General Public

diff --cc test-suite/Makefile.am
Simple merge