Merging fixes to trunk
Merging fixes to trunk

Revision: [1775]
Fixed error in hasOne associations


git-svn-id: e770600730d2d448a717592c3bff6d2b8d474ab5@1776 3807eeeb-6ff5-0310-8944-8be069107fe0

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