linhk b545c5034d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: config/locales/en.yml		2014-08-07 12:02:55 +08:00
..
en.yml	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-08-07 12:02:55 +08:00
zh.yml	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-08-07 12:02:55 +08:00