Is this the right try?
Merge branch 'ruby-fork' of github.com:stefanozanella/openshift-cartridge-httpd into ruby-fork
What a mess...