new
Merge branch 'master' of https://github.com/jmaelstrom/emacs

Conflicts:
	elpa/archives/marmalade/archive-contents
mods, including gnus