[elpa] externals/org-contacts 5526110aac 018/154: Merge branch 'origin-maint'

[ELPA Syncer]

branch: externals/org-contacts
commit 5526110aacd34ba4eef763c371f7e8b3055cda14
Merge: ef5cb2484b 2e77024e89
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