[elpa] scratch/org-contacts-rebased 5526110 018/118: Merge branch 'origin-maint'

[monnier--- via]

branch: scratch/org-contacts-rebased
commit 5526110aacd34ba4eef763c371f7e8b3055cda14
Merge: ef5cb24 2e77024
Author: Eric Schulte <eric.schu...@gmx.com>
Commit: Eric Schulte <eric.schu...@gmx.com>

    Merge branch 'origin-maint'
    
    Conflicts:
        contrib/lisp/org-mac-link-grabber.el
        doc/org.texi
        lisp/org-odt.el
        testing/lisp/test-ob.el