zendframework/zf2 — pull request #724 by vytautasgimbutas (2012-01-12 07:52:34+00:00)
Title: Docblock and DocBlock conflict

There was a conflict between DocBlock and Docblock. Probably unnoticed since it just conflicts on case-sensitive file systems.