Merge https://github.com/orenault/TestLink-API-Python-client

Conflicts:
	src/testlink/testlinkapi.py

Author: orenault

README.md

@@ -76,7 +76,7 @@ see [downloads]
 
 TestLink-API-Python-client developers
 -------------------------------------
-*   [James Stock], [Olivier Renault], kereval.com
+*   [James Stock], [Olivier Renault]
 *   [g4l4drim], [pade], [lczub] 
 *   anyone forgotten?
 

setup.py

@@ -3,7 +3,7 @@
 
 #  Copyright 2012 ??? , ???
 #
-#  Licensed under ???
+#  Licensed under Apache 2.0 
 #  
 
 from os.path import join, dirname
@@ -15,9 +15,9 @@
       version=VERSION,
       description='Python XMLRPC client for the TestLink API',
       author='James Stock, Olivier Renault, TestLink-API-Python-client developers',
-      author_email='???, ???, ???',
+      author_email='[email protected], ???, ???',
       url='https://github.com/lczub/TestLink-API-Python-client',
-      license      = 'unknown',
+      license      = 'Apache 2.0',
       package_dir  = {'': 'src'},
       packages=['testlink'],
      )

src/testlink/testlinkapi.py

@@ -162,7 +162,11 @@ def getTestCaseAttachments(self, testcaseid):
         """
         argsAPI = {'devKey' : self.devKey,
                 'testcaseid':str(testcaseid)}  
+<<<<<<< HEAD
         return self._callServer('getTestCaseAttachments', argsAPI)    
+=======
+        return self.server.tl.getTestCaseAttachments(argsAPI)    
+>>>>>>> 64bf436b3ec3d5aa38e855439ac621e3007ce909
 
     def getTestCaseCustomFieldDesignValue(self, testcaseexternalid, version, 
                                      testprojectid, customfieldname, details):