Making time_zone_options_for_select return a html_safe string

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>

actionpack/lib/action_view/helpers/form_options_helper.rb

@@ -493,7 +493,7 @@ module ActionView
         end
 
         zone_options += options_for_select(convert_zones[zones], selected)
-        zone_options
+        zone_options.html_safe
       end
 
       private

actionpack/test/template/form_options_helper_test.rb

@@ -289,6 +289,10 @@ class FormOptionsHelperTest < ActionView::TestCase
                  opts
   end
 
+  def test_time_zone_options_returns_html_safe_string
+    assert time_zone_options_for_select.html_safe?
+  end
+
   def test_select
     @post = Post.new
     @post.category = "<mus>"