Merge branch 'master' into 2.2

confirm · May 11, 2015 · c3df5ed · c3df5ed
2 parents eebaf7c + 5b91727
commit c3df5ed
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -6,10 +6,12 @@
     "homepage": "http://github.com/confirm-it-solutions/PhpZabbixApi",
     "license": "MIT",
     "authors": [
-        "name": "Dominique Barton",
-        "email": "dbarton@confirm.ch",
-        "homepage": "http://www.confirm.ch",
-        "role": "Developer"
+        {
+            "name": "Dominique Barton",
+            "email": "dbarton@confirm.ch",
+            "homepage": "http://www.confirm.ch",
+            "role": "Developer"
+        }
     ],
     "require": {
         "php": ">=5.3.0"