Merge branch 'master' of https://github.com/wenchma/erlang

Conflicts:
	metadata.rb
Merge branch 'master' of https://github.com/wenchma/erlang