[Gemstracker-svn] SF.net SVN: gemstracker:[345] trunk/library

[<gem...@li...>]

Revision: 345
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=345&view=rev
Author:   michieltcs
Date:     2011-12-07 11:27:48 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
Merge

Modified Paths:
--------------
    trunk/library/classes/Gems/Tracker/Token.php

Property Changed:
----------------
    trunk/library/


Property changes on: trunk/library
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse/library:306-342
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
   + /branches/1.5.0-pulse/library:306-344
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305

Modified: trunk/library/classes/Gems/Tracker/Token.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Token.php	2011-12-07 10:51:24 UTC (rev 344)
+++ trunk/library/classes/Gems/Tracker/Token.php	2011-12-07 11:27:48 UTC (rev 345)
@@ -60,7 +60,7 @@
      *
      * @var array The gems token data
      */
-    private $_gemsData;
+    private $_gemsData = array();
 
     /**
      *

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.