[20930] sync

Revision: 20930
          http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20930
Author:   sigurdne
Date:     2010-01-05 21:24:58 +0000 (Tue, 05 Jan 2010)
Log Message:
-----------
sync

Modified Paths:
--------------
    people/sigurdne/modules/phpgwapi/trunk/inc/class.cache.inc.php
    people/sigurdne/modules/phpgwapi/trunk/inc/class.menu.inc.php
    people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.phpmailer.php
    people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.smtp.php
    people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpmailerTest.php
    people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/testemail.php

Modified: people/sigurdne/modules/phpgwapi/trunk/inc/class.cache.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/class.cache.inc.php	2010-01-05 21:24:38 UTC (rev 20929)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/class.cache.inc.php	2010-01-05 21:24:58 UTC (rev 20930)
@@ -7,7 +7,7 @@
 	* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License Version 2 or later
 	* @package phpgroupware
 	* @subpackage phpgwapi
-	* @version $Id: class.cache.inc.php 3061 2009-06-14 18:18:21Z sigurd $
+	* @version $Id: class.cache.inc.php 4175 2009-11-22 14:00:45Z sigurd $
 	*/
 
 	/*

Modified: people/sigurdne/modules/phpgwapi/trunk/inc/class.menu.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/class.menu.inc.php	2010-01-05 21:24:38 UTC (rev 20929)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/class.menu.inc.php	2010-01-05 21:24:58 UTC (rev 20930)
@@ -7,7 +7,7 @@
 	 * @license http://www.fsf.org/licenses/gpl.html GNU General Public License
 	 * @package phpgroupware
 	 * @subpackage phpgwapi
-	 * @version $Id: class.menu.inc.php 1789 2008-11-04 13:07:09Z sigurd $
+	 * @version $Id: class.menu.inc.php 4175 2009-11-22 14:00:45Z sigurd $
 	 */
 
 	/*

Modified: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.phpmailer.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.phpmailer.php	2010-01-05 21:24:38 UTC (rev 20929)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.phpmailer.php	2010-01-05 21:24:58 UTC (rev 20930)
@@ -34,7 +34,7 @@
  * @author Andy Prevost
  * @author Marcus Bointon
  * @copyright 2004 - 2009 Andy Prevost
- * @version $Id: class.phpmailer.php 447 2009-05-25 01:36:38Z codeworxtech $
+ * @version $Id: class.phpmailer.php 4208 2009-11-23 20:15:38Z sigurd $
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
  */
 

Modified: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.smtp.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.smtp.php	2010-01-05 21:24:38 UTC (rev 20929)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.smtp.php	2010-01-05 21:24:58 UTC (rev 20930)
@@ -35,7 +35,7 @@
  * @author Marcus Bointon
  * @copyright 2004 - 2008 Andy Prevost
  * @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL)
- * @version $Id: class.smtp.php 444 2009-05-05 11:22:26Z coolbru $
+ * @version $Id: class.smtp.php 4180 2009-11-23 08:09:22Z sigurd $
  */
 
 /**

Modified: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpmailerTest.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpmailerTest.php	2010-01-05 21:24:38 UTC (rev 20929)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpmailerTest.php	2010-01-05 21:24:58 UTC (rev 20930)
@@ -9,7 +9,7 @@
 * @author Andy Prevost
 * @author Marcus Bointon
 * @copyright 2004 - 2009 Andy Prevost
-* @version $Id: phpmailerTest.php 444 2009-05-05 11:22:26Z coolbru $
+* @version $Id: phpmailerTest.php 4237 2009-11-27 23:17:21Z sigurd $
 * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
 */
 

Modified: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/testemail.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/testemail.php	2010-01-05 21:24:38 UTC (rev 20929)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/testemail.php	2010-01-05 21:24:58 UTC (rev 20930)
@@ -2,7 +2,7 @@
 /**
 * Simple example script using PHPMailer with exceptions enabled
 * @package phpmailer
-* @version $Id$
+* @version $Id: testemail.php 4237 2009-11-27 23:17:21Z sigurd $
 */
 
 require '../class.phpmailer.php';