[elpa] externals/org-contacts f71963d38a 036/154: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org-contacts
commit f71963d38af826f0b7296fef859acbee593c06eb
Merge: 3f1509bfa2 8bf8565c46
Author: Bastien Guerry <b...@altern.org>
Commit: Bastien Guerry <b...@altern.org>

    Merge branch 'maint'
    
    Conflicts:
            contrib/oldexp/org-exp.el
            lisp/org.el