alan 1010003737 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh ... Conflicts: config/locales/zh.yml		2015-01-31 15:55:17 +08:00
..
en.yml	找回密码，邮件激活国际化	2015-01-31 10:48:09 +08:00
zh.yml	Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh	2015-01-31 15:55:17 +08:00