Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-24-15-59-25

[civicrm-core.git] / CRM / Member / Import / Controller.php

diff --git a/CRM/Member/Import/Controller.php b/CRM/Member/Import/Controller.php
index 7fb89c0ec26bcca3ac94f6f8f01d58ab43e32f39..61bb9ea49c8d0f118d4a75214ac9cbed6daee991 100644 (file)
--- a/CRM/Member/Import/Controller.php
+++ b/CRM/Member/Import/Controller.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -45,7 +45,7 @@ class CRM_Member_Import_Controller extends CRM_Core_Controller {
       set_time_limit(0);
     }
 
-    $this->_stateMachine = new CRM_Member_Import_StateMachine($this, $action);
+    $this->_stateMachine = new CRM_Import_StateMachine($this, $action);
 
     // create and instantiate the pages
     $this->addPages($this->_stateMachine, $action);