[elpa] externals/org-contacts 4d41ad256d 074/154: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org-contacts
commit 4d41ad256de07d55df0acc32ac26dcfd9903ce55
Merge: 9d9246c0a5 8829fb451a
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 7cc42fc6ec..dbbc057904 100644
--- a/org-contacts.el
+++ b/org-contacts.el
@@ -1,6 +1,6 @@
 ;;; org-contacts.el --- Contacts management
 
-;; Copyright (C) 2010-2014 Julien Danjou <jul...@danjou.info>
+;; Copyright (C) 2010-2013 Julien Danjou <jul...@danjou.info>
 
 ;; Author: Julien Danjou <jul...@danjou.info>
 ;; Keywords: outlines, hypermedia, calendar