zendframework/zf2 — pull request #1248 by mfacenet (2012-05-17 15:05:44+00:00)
Title: Bad Merge

A conflict wasn't cleaned up.