clojuring
Merge remote-tracking branch 'origin/master'

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