Merge pull request wikimedia#40 from bd808/credits

Touch up credits information

Author: legoktm

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Bryan Davis, Wikimedia Foundation, and contributors
+Copyright (c) 2015 Bryan Davis, Wikimedia Foundation, and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -3,6 +3,12 @@
  "description": "Composer plugin to merge multiple composer.json files",
  "type": "composer-plugin",
  "license": "MIT",
+ "authors": [
+ {
+ "name": "Bryan Davis",
+ "email": "bd808@wikimedia.org"
+ }
+ ],
  "minimum-stability": "dev",
  "prefer-stable": true,
  "require": {

src/MergePlugin.php

@@ -2,7 +2,7 @@
 /**
  * This file is part of the Composer Merge plugin.
  *
- * Copyright (C) 2014 Bryan Davis, Wikimedia Foundation, and contributors
+ * Copyright (C) 2015 Bryan Davis, Wikimedia Foundation, and contributors
  *
  * This software may be modified and distributed under the terms of the MIT
  * license. See the LICENSE file for details.

tests/phpunit/MergePluginTest.php

@@ -2,7 +2,7 @@
 /**
  * This file is part of the Composer Merge plugin.
  *
- * Copyright (C) 2014 Bryan Davis, Wikimedia Foundation, and contributors
+ * Copyright (C) 2015 Bryan Davis, Wikimedia Foundation, and contributors
  *
  * This software may be modified and distributed under the terms of the MIT
  * license. See the LICENSE file for details.