Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-01-18 09:17:33 +01:00
commit 92c9b69b7f
2 changed files with 4 additions and 2 deletions

View File

@ -2,7 +2,8 @@
;; Copyright (C) 2009-2014 Free Software Foundation, Inc. ;; Copyright (C) 2009-2014 Free Software Foundation, Inc.
;; Author: Eric Schulte and Thomas S. Dye ;; Author: Eric Schulte
;; Thomas S. Dye
;; Keywords: literate programming, reproducible research ;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org ;; Homepage: http://orgmode.org

View File

@ -2,7 +2,8 @@
;; Copyright (C) 2010-2014 Free Software Foundation, Inc. ;; Copyright (C) 2010-2014 Free Software Foundation, Inc.
;; Authors: Eric Schulte, Michael Gauland ;; Authors: Eric Schulte
;; Michael Gauland
;; Keywords: literate programming, reproducible research, scheme ;; Keywords: literate programming, reproducible research, scheme
;; Homepage: http://orgmode.org ;; Homepage: http://orgmode.org