Merge pull request #20 in ZP/z-push from...

Merge pull request #20 in ZP/z-push from bugfix/ZP-657-backendcombined-wrong-parameter-name to develop

* commit 'bbd1fd4d':
  ZP-657 Wrong parameter name. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 316da552)

src/backend/combined/combined.php

@@ -362,11 +362,11 @@ class BackendCombined extends Backend {
      * @return string       id of the created/updated calendar obj
      * @throws StatusException
      */
-    public function MeetingResponse($requestid, $folderid, $error) {
+    public function MeetingResponse($requestid, $folderid, $response) {
         $backend = $this->GetBackend($folderid);
         if($backend === false)
             return false;
-        return $backend->MeetingResponse($requestid, $this->GetBackendFolder($folderid), $error);
+        return $backend->MeetingResponse($requestid, $this->GetBackendFolder($folderid), $response);
     }
 
     /**