at least mwe-log-keyboard-commands installed
Merge branch 'master' of https://github.com/MarkkuKovanen/emacs

Conflicts:
	elpa/archives/gnu/archive-contents
	elpa/archives/marmalade/archive-contents