Half it (compromise)
Merge branch 'master' of github.com:DCPython/dcpython-django
Merge branch 'master' of github.com:DCPython/dcpython-django