openshift/origin-server — pull request #1281 by danmcp (2013-02-01 21:41:50+00:00)
Title: Bug 901444

Fixing bad merge