branch: master commit 6d4e1a5df00da26de98d64d724a3162115377b1c Merge: 1f813ba c52a60f Author: Thierry Volpiatto <[email protected]> Commit: Thierry Volpiatto <[email protected]>
Merge branch 'master' of github.com:jwiegley/emacs-async
Conflicts:
async.el
