sw a0e6b9c2fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: config/locales/zh.yml		2015-01-22 17:51:11 +08:00
..
en.yml	Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh	2015-01-22 16:32:53 +08:00
zh.yml	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-22 17:51:11 +08:00