Merge branch 'maint'

Conflicts:
	contrib/lisp/org-favtable.el
This commit is contained in:
Bastien Guerry 2014-01-05 06:36:11 +01:00
commit 4d41ad256d

View file

@ -1,6 +1,6 @@
;;; org-contacts.el --- Contacts management
;; Copyright (C) 2010-2014 Julien Danjou <julien@danjou.info>
;; Copyright (C) 2010-2013 Julien Danjou <julien@danjou.info>
;; Author: Julien Danjou <julien@danjou.info>
;; Keywords: outlines, hypermedia, calendar