Merging fixes for associations to 1.1.x.x branch Removed commented code from Model::_ _generateAssociation() in 1.2.x.x
Merging fixes for associations to 1.1.x.x branch
Removed commented code from Model::_ _generateAssociation() in 1.2.x.x

git-svn-id: 5860920b332e8b1c20d5ac1ddb0cfb1512ef151a@3796 3807eeeb-6ff5-0310-8944-8be069107fe0

erikfig/cakephp,khoimt/cakephp-study,berrygoudswaard/cakephp,ADmad/cakephp,yinhe007/cakephp,dakota/cakephp,pbaire/cakephp,kumamidori/cakephp,eryw/cakephp,CVO-Technologies/cakephp,garethellis36/cakephp,adopico/cakephp,akintoey/cakephp,akintoey/cakephp,tenkoma/cakephp,CakeDC/cakephp,jjj117/cakephp,davidyell/cakephp,justinyost/cakephp,dakota/cakephp,tenkoma/cakephp,cakephp/cakephp,tgr0ss/cakephp,eboominathan/cakephp,dakota/cakephp,nrother/cakephp,timhoeppner/cakephp,yinhe007/cakephp,tgr0ss/cakephp,gmponos/cakephp,tisu2tisu/cakephp,erikfig/cakephp,garethellis36/cakephp,thinkingmedia/cakephp,pbaire/cakephp,mvdriel/cakephp,mvdriel/cakephp,jeffblack360/cakephp,CakeDC/cakephp,justinyost/cakephp,web-player/cakephp,web-player/cakephp,petteyg/cakephp,ADmad/cakephp,ndm2/cakephp,petteyg/cakephp,davidyell/cakephp,davidyell/cakephp,petteyg/cakephp,timhoeppner/cakephp,michaelze/cakephp,et304383/passbolt_api,web-player/cakephp,elboletaire/cakephp,ndm2/cakephp,ndm2/cakephp,tisu2tisu/cakephp,thinkingmedia/cakephp,justinyost/cakephp,jeffblack360/cakephp,tisu2tisu/cakephp,ionas/cakephp,ADmad/cakephp,tgr0ss/cakephp,elboletaire/cakephp,kumamidori/cakephp,jerems02/cakephp,CakeDC/cakephp,dkarvounaris/cakephp,burriko/cakephp,jjj117/cakephp,bravo-kernel/cakephp,garethellis36/cakephp,et304383/passbolt_api,Balachan27/cakephp,et304383/passbolt_api,kumamidori/cakephp,tenkoma/cakephp,eboominathan/cakephp,petteyg/cakephp,eboominathan/cakephp,garethellis36/cakephp,CakeDC/cakephp,et304383/passbolt_api,khoimt/cakephp-study,gmponos/cakephp,jeffblack360/cakephp,ionas/cakephp,cakephp/cakephp,akintoey/cakephp,cakephp/cakephp,Balachan27/cakephp,michaelze/cakephp,nrother/cakephp,ionas/cakephp,HavokInspiration/cakephp,jjj117/cakephp,Balachan27/cakephp,nrother/cakephp,et304383/passbolt_api,dkarvounaris/cakephp,HavokInspiration/cakephp,berrygoudswaard/cakephp,pbaire/cakephp,cakephp-fr/cakephp,ndm2/cakephp,mvdriel/cakephp,eryw/cakephp,jerems02/cakephp,eryw/cakephp,khoimt/cakephp-study,Phillaf/cakephp,dakota/cakephp,HavokInspiration/cakephp,burriko/cakephp,gmponos/cakephp,Phillaf/cakephp,berrygoudswaard/cakephp,jerems02/cakephp,adopico/cakephp,bravo-kernel/cakephp,erikfig/cakephp,Phillaf/cakephp,cakephp-fr/cakephp,michaelze/cakephp,yinhe007/cakephp,burriko/cakephp,timhoeppner/cakephp,cakephp/cakephp,thinkingmedia/cakephp,adopico/cakephp,CVO-Technologies/cakephp,CVO-Technologies/cakephp,ADmad/cakephp,mvdriel/cakephp,bravo-kernel/cakephp,dkarvounaris/cakephp,tenkoma/cakephp,elboletaire/cakephp,cakephp-fr/cakephp