Signed-off-by: unknown <ascoon@163.com>
Merge branch 'linuxa'

Conflicts:
	index.php

Signed-off-by: unknown <ascoon@163.com>
Signed-off-by: unknown <ascoon@163.com>
Merge branch 'linuxa'

Conflicts:
	index.php