Merge branch 'cs/zendframework/zf2#7139-fix-email-validator-docblock-… · laminas/laminas-serializer@35a43e2 · GitHub

Commit

Merge branch 'cs/zendframework/zendframework#7139-fix-email-validator…

Browse files

…-docblock-wrapped-uri-validator' into develop

Closer zendframework/zendframework#7139
Forward port zendframework/zendframework#7139

Loading branch information

Ocramius committed Jan 22, 2015

2 parents 8de47e4 + 928e6b0 commit 35a43e2