[elpa] scratch/org-contacts-rebased 19baaca 073/118: Merge branch 'maint'

[monnier--- via]

branch: scratch/org-contacts-rebased
commit 19baacab29d884bbe8be22dd3525dbfc4c343a07
Merge: e6e9fd8 13d35c9
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 dbbc057..7cc42fc 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