Adding merge support for PluginAppController properties
Adding merge support for PluginAppController properties

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

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