Merge remote-tracking branch 'refs/remotes/origin/master'
[mdref/mdref] / AUTHORS
1 Michael Wallner <mike@php.net>