using strict
wut
Merge branch 'openshift'
trying to get ws to work
ws fixing
blah
almost there?
Merge branch 'master' into openshift