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

…uter-http-method
zendframework · May 16, 2012 · d0b7057 · d0b7057
2 parents af19258 + ef5a070
commit d0b7057
Show file tree

Hide file tree

Showing 18 changed files with 2,467 additions and 0 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