Merge branch 'hotfix/1.21.2' into stable
Suppress warning when /etc/make.conf doesn't exist in FreeBSD
Improve pkgng detection from /etc/make.conf in FreeBSD
Use bash syntax for file detection - update #1984
Merge pull request #1984 from carpodaster/minor-freebsd-pkng-detection-improvements

Minor FreeBSD pkgng detection improvements
added new ruby releases
fix detecting clang for OSX 10.9, fix #1975
Merge branch 'master' of github.com:wayneeseguin/rvm
add new line in generate .rvmrc Using:, update #1903
security update for mri rubies versions
Merge https://github.com/somebody32/rvm, update #1987

Conflicts:
	config/known
	config/md5
1.21.3
Merge branch 'master' into hotfix/1.21.3
Merge branch 'hotfix/1.21.3'
added railsexpress patches for 1.9.3-p448
Merge pull request #1990 from skaes/master

railsexpress patches for latest 1.9.3 release (p448)
remove references to openSUSE from common *suse code, update #1991
Merge branch 'master' of github.com:wayneeseguin/rvm
abstract installing packages from source, update #1991
making any ruby*-head check for compatible ruby available, fix #1995