branch: externals/org-contacts commit c1a17bf632d870bcde60d609cb4d1532e279d04a Merge: 4d41ad256d fd0f42a1bc Author: Bastien Guerry <b...@altern.org> Commit: Bastien Guerry <b...@altern.org>
Merge branch 'maint' Conflicts: contrib/lisp/org-favtable.el --- org-contacts.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org-contacts.el b/org-contacts.el index dbbc057904..7cc42fc6ec 100644 --- a/org-contacts.el +++ b/org-contacts.el @@ -1,6 +1,6 @@ ;;; org-contacts.el --- Contacts management -;; Copyright (C) 2010-2013 Julien Danjou <jul...@danjou.info> +;; Copyright (C) 2010-2014 Julien Danjou <jul...@danjou.info> ;; Author: Julien Danjou <jul...@danjou.info> ;; Keywords: outlines, hypermedia, calendar