[elpa] externals/org-contacts e516efacb6 037/154: Merge branch 'maint'

[ELPA Syncer]

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

    Merge branch 'maint'
    
    Conflicts:
            lisp/org.el