2014-8-31 linyb 代码合并
Merge remote-tracking branch 'origin/master'