Fitorec e7c913acba Fix unreachable code in Model mergeVars ... Squashed commit of the following: commit c8326460a4 Author: Fitorec <chanerec@gmail.com> Date: Tue Dec 6 18:04:11 2011 -0600 add a space after the comma in the $merge array commit 22ad6cdca5 Author: Fitorec <chanerec@gmail.com> Date: Tue Dec 6 03:31:54 2011 -0600 removing the condition and adding actsAs to the default list of merged keys. commit afa4dd0dee Author: Fitorec <chanerec@gmail.com> Date: Mon Dec 5 12:10:32 2011 -0600 Solving the small defect in the array of behaviors(actsAs) Signed-off-by: mark_story <mark@mark-story.com>		2011-12-18 10:38:17 -05:00
..
Cake	Fix unreachable code in Model mergeVars	2011-12-18 10:38:17 -05:00