radu/Django-Hackathon-Starter: A boilerplate application for Django web applications. @ 66de6d9aaeea8eb29e6c1e2683dac4c3b3b85e5c

David Leonard 66de6d9aae Merging Marco's pull request		10 lat temu
..
__init__.py	2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request	10 lat temu
testcase.py	2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request	10 lat temu
testgithub.py	bc5fad0b55 Restoring Github tests and coverage to 100%	10 lat temu
teststeam.py	2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request	10 lat temu
testtumblr.py	2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request	10 lat temu