sup

commit f4be1427f7621ac8d510e665062b98feb70e707f
parent 79300209f78a6af90e896bcec2d121118647b506
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Tue,  5 Jan 2010 13:12:41 -0800

Merge branch 'master' into next

Conflicts:

	lib/sup/util.rb

Diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/sup/util.rb b/lib/sup/util.rb
@@ -686,7 +686,7 @@ class Iconv
     begin
       returning(Iconv.iconv(target, charset, text + " ").join[0 .. -2]) { |str| str.check }
     rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::InvalidCharacter, Iconv::IllegalSequence, String::CheckError
-      warn "couldn't transcode text from #{orig_charset} (#{charset}) to #{target}) (#{text[0 ... 20].inspect}...) (got #{$!.message} (#{$!.class}))"
+      debug "couldn't transcode text from #{orig_charset} (#{charset}) to #{target}) (#{text[0 ... 20].inspect}...) (got #{$!.message} (#{$!.class}))"
       text.ascii
     end
   end