Merge branch 'master' of git://github.com/zendframework/zf2 into hotf…

…ix/uri-path-not-being-set-when-empty
zendframework · Aug 3, 2012 · b64275a · b64275a
commit b64275a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Page/AbstractPage.php b/src/Page/AbstractPage.php
@@ -641,7 +641,7 @@ public function getOrder()
     }
 
     /**
-     * Sets ACL resource assoicated with this page
+     * Sets ACL resource associated with this page
      *
      * @param  string|AclResource $resource [optional] resource to associate
      *                                      with page. Default is null, which