openshift/origin-server — pull request #4070 by rajatchopra (2013-11-01 19:23:14+00:00)
Title: fix bz1025229 and bz1025055

[merge]