Merge branch 'master' into php5

* master:
  Add people from AUTHORS to composer.json.
This commit is contained in:
Andreas Fischer 2013-11-29 23:07:18 +01:00
commit bdf4f8f58c

View File

@ -27,6 +27,21 @@
{
"name": "Jim Wigginton",
"email": "terrafrost@php.net",
"role": "Lead Developer"
},
{
"name": "Patrick Monnerat",
"email": "pm@datasphere.ch",
"role": "Developer"
},
{
"name": "Andreas Fischer",
"email": "bantu@phpbb.com",
"role": "Developer"
},
{
"name": "Hans-Jürgen Petrich",
"email": "petrich@tronic-media.com",
"role": "Developer"
}
],