Merge branch 'elektronaut-ruby1.9'
authorJoel Martin <github@martintribe.org>
Sat, 28 Feb 2015 17:31:50 +0000 (11:31 -0600)
committerJoel Martin <github@martintribe.org>
Sat, 28 Feb 2015 17:31:50 +0000 (11:31 -0600)

Trivial merge