Merge remote-tracking branch 'upstream/master' into fix/annotaion_input

zendframework · Aug 29, 2013 · ecb5260 · ecb5260
commit ecb5260
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/test/HostnameTest.php b/test/HostnameTest.php
@@ -156,7 +156,7 @@ public function testIDN()
     }
 
     /**
-     * Ensure the IDN check works on ressource files as expected
+     * Ensure the IDN check works on resource files as expected
      *
      */
     public function testRessourceIDN()