cbsi/doctrine2 — pull request #2 by sdornan (2012-12-03 05:14:34+00:00)
Title: Merge 2.3 upstream

Merge upstream changes on the 2.3 branch.