winlin 00c60db7c3 Merge branch '2.0release' into develop		2016-01-31 22:47:48 +08:00
..
static-dir	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
server.py	Merge branch '2.0release' into develop	2016-01-31 22:47:48 +08:00