huang 29df528af1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/views/welcome/index.html.erb config/locales/zh.yml config/routes.rb		2015-01-30 14:27:56 +08:00
..
javascripts	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-30 14:27:56 +08:00
stylesheets	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-30 14:27:56 +08:00