修改
Merge branch 'release/20141201' of github.com:gokuai/fengcloud into release/20141201