Merge branch 'kou-master'

Conflicts: test/test_fetchers.rb
joe1chen · Feb 23, 2012 · d3e7121 · d3e7121
2 parents 663fc45 + b7d4fd7
commit d3e7121
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/test/test_fetchers.rb b/test/test_fetchers.rb
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 require "test_helper"
-
 require 'net/http'
 require 'webrick'
 require 'openid/fetchers'