summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-10-08 08:08:11 +0200
committerBastien Guerry <bzg@altern.org>2013-10-08 08:08:11 +0200
commit2829fdad0be5f3a5d294ab73dcc8357f7cae6feb (patch)
treeee4364e9c7a6687e2c2bb0213c01578ba5b997e2
parent379e2b1beaa4a6c83b3856ac5eb1256bb279a7be (diff)
parent0eb0e5778bb61d6364acd6a11516c7e4df3b3b62 (diff)
downloadorg-mode-2829fdad0be5f3a5d294ab73dcc8357f7cae6feb.tar.gz
Merge branch 'maint'
-rw-r--r--contrib/lisp/org-registry.el4
-rw-r--r--contrib/lisp/org-toc.el2
-rw-r--r--contrib/lisp/org-track.el2
-rw-r--r--contrib/lisp/ox-rss.el2
-rw-r--r--lisp/org-bibtex.el2
-rw-r--r--lisp/org-list.el2
-rw-r--r--lisp/org-protocol.el2
-rw-r--r--lisp/org-src.el2
-rw-r--r--mk/eldo.el2
9 files changed, 10 insertions, 10 deletions
diff --git a/contrib/lisp/org-registry.el b/contrib/lisp/org-registry.el
index 1950797..b0ee208 100644
--- a/contrib/lisp/org-registry.el
+++ b/contrib/lisp/org-registry.el
@@ -5,8 +5,8 @@
;; Emacs Lisp Archive Entry
;; Filename: org-registry.el
;; Version: 0.1a
-;; Author: Bastien Guerry <bzg AT gnu DOT org>
-;; Maintainer: Bastien Guerry <bzg AT gnu DOT org>
+;; Author: Bastien Guerry <bzg@gnu.org>
+;; Maintainer: Bastien Guerry <bzg@gnu.org>
;; Keywords: org, wp, registry
;; Description: Shows Org files where the current buffer is linked
;; URL: http://www.cognition.ens.fr/~guerry/u/org-registry.el
diff --git a/contrib/lisp/org-toc.el b/contrib/lisp/org-toc.el
index e0e6098..2d6c846 100644
--- a/contrib/lisp/org-toc.el
+++ b/contrib/lisp/org-toc.el
@@ -2,7 +2,7 @@
;; Copyright 2007-2013 Free Software Foundation, Inc.
;;
-;; Author: Bastien Guerry <bzg AT gnu DOT org>
+;; Author: Bastien Guerry <bzg@gnu.org>
;; Keywords: Org table of contents
;; Homepage: http://www.cognition.ens.fr/~guerry/u/org-toc.el
;; Version: 0.8
diff --git a/contrib/lisp/org-track.el b/contrib/lisp/org-track.el
index db8c34e..4a9d71d 100644
--- a/contrib/lisp/org-track.el
+++ b/contrib/lisp/org-track.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2009-2013
;; Free Software Foundation, Inc.
;;
-;; Author: Bastien Guerry <bzg at altern dot org>
+;; Author: Bastien Guerry <bzg@gnu.org>
;; Eric S Fraga <e.fraga at ucl.ac dot uk>
;; Sebastian Rose <sebastian_rose at gmx dot de>
;; The Worg people http://orgmode.org/worg/
diff --git a/contrib/lisp/ox-rss.el b/contrib/lisp/ox-rss.el
index c237bec..a09366d 100644
--- a/contrib/lisp/ox-rss.el
+++ b/contrib/lisp/ox-rss.el
@@ -2,7 +2,7 @@
;; Copyright (C) 2013 Bastien Guerry
-;; Author: Bastien Guerry <bzg at gnu dot org>
+;; Author: Bastien Guerry <bzg@gnu.org>
;; Keywords: org, wp, blog, feed, rss
;; This file is not yet part of GNU Emacs.
diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el
index 8d85335..1f71d91 100644
--- a/lisp/org-bibtex.el
+++ b/lisp/org-bibtex.el
@@ -2,7 +2,7 @@
;;
;; Copyright (C) 2007-2013 Free Software Foundation, Inc.
;;
-;; Authors: Bastien Guerry <bzg at gnu dot org>
+;; Authors: Bastien Guerry <bzg@gnu.org>
;; Carsten Dominik <carsten dot dominik at gmail dot com>
;; Eric Schulte <schulte dot eric at gmail dot com>
;; Keywords: org, wp, capture
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 9a089f5..4a3d471 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2004-2013 Free Software Foundation, Inc.
;;
;; Author: Carsten Dominik <carsten at orgmode dot org>
-;; Bastien Guerry <bzg AT gnu DOT org>
+;; Bastien Guerry <bzg@gnu.org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
;;
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 24a319d..84b1176 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -2,7 +2,7 @@
;;
;; Copyright (C) 2008-2013 Free Software Foundation, Inc.
;;
-;; Authors: Bastien Guerry <bzg AT gnu DOT org>
+;; Authors: Bastien Guerry <bzg@gnu.org>
;; Daniel M German <dmg AT uvic DOT org>
;; Sebastian Rose <sebastian_rose AT gmx DOT de>
;; Ross Patterson <me AT rpatterson DOT net>
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 062d2d7..6ec3adc 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2004-2013 Free Software Foundation, Inc.
;;
;; Author: Carsten Dominik <carsten at orgmode dot org>
-;; Bastien Guerry <bzg AT gnu DOT org>
+;; Bastien Guerry <bzg@gnu.org>
;; Dan Davison <davison at stats dot ox dot ac dot uk>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org
diff --git a/mk/eldo.el b/mk/eldo.el
index 96587df..ad304ab 100644
--- a/mk/eldo.el
+++ b/mk/eldo.el
@@ -2,7 +2,7 @@
;; Copyright (C) 2012, 2013 Bastien Guerry
;;
-;; Author: Bastien Guerry <bzg at gnu dot org>
+;; Author: Bastien Guerry <bzg@gnu.org>
;; Keywords: elisp, documentation, org
;; Homepage: http://orgmode.org
;;