doctrine/doctrine2 — pull request #879 by aaronmu (2013-12-14 15:01:38+00:00)
Title: [WIP] Create failing test for DDC-2645.

Merge not dealing correctly with composite primary keys.