Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ
..
__init__.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ
testcase.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ
testgithub.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ
teststeam.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ
testtumblr.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 gadi atpakaļ