Changeset 670 for team

Show
Ignore:
Timestamp:
09/30/07 22:01:01 (16 months ago)
Author:
www-data
Message:

automerge commit

Location:
team/michiel/import_blogs
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • team/michiel/import_blogs

    • Property svnmerge-integrated changed from /trunk:1-657 to /trunk:1-669

  • team/michiel/import_blogs/README

    r583 r670  
    22 
    33Copyright (c) 2005-2007, Michiel van Baak <mvanbaak (AT) users (DOT) sourceforge (DOT) net> 
    4 Logo design (c) 2005-2006, Sofie van Tendeloo <eldridge (AT) users (DOT) sourceforge (DOT) net> 
     4Logo design (c) 2005-2007, Sofie van Tendeloo <eldridge (AT) users (DOT) sourceforge (DOT) net> 
    55Significant work done by Ferry Boender <f.boender (AT) electricmonk (DOT) nl> 
    66Licensed under the General Public License (GPL), see LICENSE file