Merge branch 'master' into 2.4

confirm · May 11, 2015 · b5dfecb · b5dfecb
2 parents 63a9743 + bca786d
commit b5dfecb
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -6,6 +6,10 @@
     "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"
     ],
     "require": {
         "php": ">=5.3.0"