edit
Merge branch 'master' of github.com:vzhukovskii/jruby