Merge branch 'maint'

Conflicts:
	contrib/lisp/org-favtable.el
This commit is contained in:
Bastien Guerry 2014-01-07 14:19:03 +01:00
commit c1a17bf632

View file

@ -1,6 +1,6 @@
;;; org-contacts.el --- Contacts management ;;; 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> ;; Author: Julien Danjou <julien@danjou.info>
;; Keywords: outlines, hypermedia, calendar ;; Keywords: outlines, hypermedia, calendar