From c8326460a46e563816ebfe7d9a13c475c2f0be63 Mon Sep 17 00:00:00 2001
From: Fitorec <chanerec@gmail.com>
Date: Tue, 6 Dec 2011 18:04:11 -0600
Subject: [PATCH] add a space after the comma in the $merge array

---
 lib/Cake/Model/Model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
index 55a36269d..fa79c3dcd 100644
--- a/lib/Cake/Model/Model.php
+++ b/lib/Cake/Model/Model.php
@@ -675,7 +675,7 @@ class Model extends Object {
 		}
 
 		if (is_subclass_of($this, 'AppModel')) {
-			$merge = array('actsAs','findMethods');
+			$merge = array('actsAs', 'findMethods');
 			$parentClass = get_parent_class($this);
 			if ($parentClass !== 'AppModel') {
 				$this->_mergeVars($merge, $parentClass);