[SQL-CVS] r4312 - in SQLObject/trunk: docs sqlobject

[<sub...@co...>]

Author: phd
Date: Wed Dec 22 04:19:00 2010
New Revision: 4312

Log:
Merged revision 4310 from branch 0.14: changed my online identity.

Modified:
   SQLObject/trunk/docs/Authors.txt
   SQLObject/trunk/sqlobject/main.py

Modified: SQLObject/trunk/docs/Authors.txt
==============================================================================
--- SQLObject/trunk/docs/Authors.txt	Wed Dec 22 04:18:05 2010	(r4311)
+++ SQLObject/trunk/docs/Authors.txt	Wed Dec 22 04:19:00 2010	(r4312)
@@ -24,7 +24,7 @@
 * Christopher Singley <csingley at gmail.com>
 * David Keeney <dkeeney at rdbhost.com>
 * Daniel Fetchinson <fetchinson at googlemail.com>
-* Oleg Broytman <ph...@ph...>
+* Oleg Broytman <ph...@ph...>
 
 .. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
    :target: http://sourceforge.net/projects/sqlobject

Modified: SQLObject/trunk/sqlobject/main.py
==============================================================================
--- SQLObject/trunk/sqlobject/main.py	Wed Dec 22 04:18:05 2010	(r4311)
+++ SQLObject/trunk/sqlobject/main.py	Wed Dec 22 04:19:00 2010	(r4312)
@@ -7,7 +7,7 @@
 SQLObject is a object-relational mapper.  See SQLObject.html or
 SQLObject.txt for more.
 
-With the help by Oleg Broytman <ph...@ph...> and many other contributors.
+With the help by Oleg Broytman and many other contributors.
 See Authors.txt.
 
 This program is free software; you can redistribute it and/or modify