Merge branch 'srs.master'

AUTHORS.txt

@@ -1,17 +1,17 @@
 PRIMARY ordered by first contribution.
-* winlin<winlin@vip.126.com>
+* winlin<winlin@vip.126.com> "Plan, arch, implement SRS1.0 and SRS2.0"
 
 AUTHORS ordered by first contribution.
-* wenjie.zhao<740936897@qq.com>
+* wenjie.zhao<740936897@qq.com> "The bandwidth test module"
 
 CONTRIBUTORS ordered by first contribution.
-* xiangcheng.liu<liuxc0116@foxmail.com>
+* xiangcheng.liu<liuxc0116@foxmail.com> "Bug fixed"
-* naijia.liu<youngcow@youngcow.net>
+* naijia.liu<youngcow@youngcow.net> "Performance benchmark"
-* alcoholyi<alcoholyi@qq.com>
+* alcoholyi<alcoholyi@qq.com> "Bug fixed"
-* byteman<wangchen2011@gmail.com>
+* byteman<wangchen2011@gmail.com> "Bug fixed"
-* chad.wang<chad.wang.cn@gmail.com>
+* chad.wang<chad.wang.cn@gmail.com> "Bug fixed"
-* suhetao<suhetao@gmail.com>
+* suhetao<suhetao@gmail.com> "Bug fixed"
-* Johnny<fengjihu@163.com>
+* Johnny<fengjihu@163.com> "Create domain ossrs.net"
-* karthikeyan<keyanmca@gmail.com>
+* karthikeyan<keyanmca@gmail.com> "Bug fixed"
-* StevenLiu<lq@chinaffmpeg.org>
+* StevenLiu<lq@chinaffmpeg.org> "Build SRS on Darwin OSX"
-* zhengfl<zhengfl_1989@126.com>
+* zhengfl<zhengfl_1989@126.com> "Bug fixed"