lmacken/openshift-quickstarter — pull request #3 by ralphbean (2011-12-31 18:34:13+00:00)
Title: Fixed that merge-hell bug.

It was because we had autosetuprebase=always set in our global git config.

Also contributed some style cleanups.
1) PEP8
2) Rename of the remote from 'upstream' to 'quickstart'