This commit was manufactured by cvs2svn to create branch 'b3-3-dev'.

Sprout from master 2005-04-18 21:32:09 UTC Klaus Hofeditz  <klaus.hofeditz@project-open.com> 'Initial Import'
Cherrypick from b3-2-patches 2007-03-12 15:32:36 UTC cvs2svn <oct@openacs.org> 'This commit was manufactured by cvs2svn to create branch 'b3-2-patches'.':
    catalog/acs-subsite.pt_BR.ISO-8859-1.xml
    www/admin/subsite-add.adp
    acs-subsite.info
    catalog/acs-subsite.es_ES.ISO-8859-1.xml
    www/register/index.tcl
    lib/login.adp
    catalog/acs-subsite.en_US.ISO-8859-1.xml
    www/permissions/perm-user-add-include.xql
    catalog/acs-subsite.de_DE.ISO-8859-1.xml
    www/members/user-batch-add-2.tcl
    www/register/account-closed.tcl
    www/permissions/perm-user-add-include-postgresql.xql
    www/register/index.adp
    lib/login.tcl
    lib/user-new.tcl
Delete:
    catalog/acs-subsite.ms_my.utf-8.xml
- Malte
-Malte
- Malte
- Malte
- Malte
- resolved conflicts
- Malte