Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/models/mailer.rb

@@ -255,7 +255,7 @@ class Mailer < ActionMailer::Base
   # 作业截止时间邮件提醒
   def homework_endtime__added(homework_common, user_id)
     user = User.find(user_id)
-    @subject = "#{l(:mail_homework)}#{homework_common.name}#{l(:mail_homework_endtime)} "
+    @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_homework_endtime)} "
     @token = Token.get_token_from_user(user, 'autologin')
     @homework_endtime_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
     @homework_endtime_name = homework_common.name