ruby-2.1.0
Merge branch 'master' of github.com:wayneeseguin/rvm

Conflicts:
	config/db