branch: scratch/org-contacts-rebased
commit dcd8af90c918935f656afc4f335a3ba08d79138b
Merge: 1b6cff5 8bf8565
Author: Bastien Guerry <b...@altern.org>
Commit: Bastien Guerry <b...@altern.org>
Merge branch 'maint'
Conflicts:
contrib/lisp/htmlize.el
etc/schema/od-manifest-schema-v1.2-os.rnc
etc/schema/od-schema-v1.2-os.rnc
lisp/org-exp-blocks.el
---
org-contacts.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/org-contacts.el b/org-contacts.el
index 7e3cbb7..a567a9b 100644
--- a/org-contacts.el
+++ b/org-contacts.el
@@ -1,6 +1,6 @@
;;; org-contacts.el --- Contacts management
-;; Copyright (C) 2010-2012 Julien Danjou <jul...@danjou.info>
+;; Copyright (C) 2010-2013 Julien Danjou <jul...@danjou.info>
;; Author: Julien Danjou <jul...@danjou.info>
;; Keywords: outlines, hypermedia, calendar
