[elpa] externals-release/org 4f7dc0b6e8 3/4: Merge branch 'km/from-emacs-30' into bugfix

[ELPA Syncer]

branch: externals-release/org
commit 4f7dc0b6e84d930f5d7b8a671ac8b9fe2d1f2e83
Merge: a1bc565d83 d6bc0c0b09
Author: Kyle Meyer <k...@kyleam.com>
Commit: Kyle Meyer <k...@kyleam.com>

    Merge branch 'km/from-emacs-30' into bugfix