cakephp/cakephp — pull request #4999 by lorenzo (2014-10-27 22:12:23+00:00)
Title: 3.0 fix btm marshaller

This fixes the bug https://github.com/cakephp/cakephp/pull/4237 was trying to fix, but adds support for composite keys and tests