Merge branch 'master' of http://121.40.40.223:3000/wiipu/boniu

# Conflicts:
#	lib/sina.class.php

task/task_get_all_stock_code_name.sh

@@ -5,6 +5,7 @@ echo '正在获取所有股票代码和名称...'
 nohup php ./task_get_all_stock_code_name.php &
 sleep 1s
 echo "完成！"
+
 rm -f nohup.out
 sleep 1s