Merge branch 'master' of github.com:zendframework/zf2 into feature/ro…

…uter-http-method
zendframework · May 16, 2012 · 14593e3 · 14593e3
2 parents 319bc43 + 7ead6eb
commit 14593e3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 156 deletions.
diff --git a/.travis/skipped-components b/.travis/skipped-components
@@ -1,5 +1,6 @@
 Zend/Amf
 Zend/Date
+Zend/Dojo
 Zend/Queue
 Zend/Service
 Zend/Test

diff --git a/src/Helper/FormCsrf.php b/src/Helper/FormCsrf.php
diff --git a/test/Helper/FormCsrfTest.php b/test/Helper/FormCsrfTest.php