Skip to content
Commit f3f230e4 authored by Joshua Peek's avatar Joshua Peek
Browse files

Merge branch 'master' into ree 

Conflicts:
	bin/ruby-build
parents 23ccbd7d 81901adf
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment