orenault/TestLink-API-Python-client — pull request #6 by dnozay (2013-09-05 16:37:10+00:00)
Title: fix merge conflict markers.

There is a conflict that was pushed and left unresolved. fix that.