Merge remote-tracking branch 'six8/rbenv'
authorTravis Swicegood <development@domain51.com>
Mon, 7 May 2012 23:13:31 +0000 (18:13 -0500)
committerTravis Swicegood <development@domain51.com>
Mon, 7 May 2012 23:13:31 +0000 (18:13 -0500)

Trivial merge