Merge branch 'maint'
Conflicts: contrib/lisp/org-favtable.el
This commit is contained in:
commit
9d9246c0a5
1 changed files with 1 additions and 1 deletions
|
@ -1,6 +1,6 @@
|
|||
;;; org-contacts.el --- Contacts management
|
||||
|
||||
;; Copyright (C) 2010-2013 Julien Danjou <julien@danjou.info>
|
||||
;; Copyright (C) 2010-2014 Julien Danjou <julien@danjou.info>
|
||||
|
||||
;; Author: Julien Danjou <julien@danjou.info>
|
||||
;; Keywords: outlines, hypermedia, calendar
|
||||
|
|
Loading…
Reference in a new issue