[elpa] externals/org f90f6912af 2/2: Merge branch 'km/from-emacs-master'

[ELPA Syncer]

branch: externals/org
commit f90f6912afd17001006e9b1b30ad5af86342ebe8
Merge: af956f94f6 52b6f29d30
Author: Kyle Meyer <k...@kyleam.com>
Commit: Kyle Meyer <k...@kyleam.com>

    Merge branch 'km/from-emacs-master'