Module Name: htdocs Committed By: kano Date: Sun Mar 1 10:04:19 JST 2009 htdocs/ja Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv25251 Log Message: import from TNF. index.html: 1.1590 Status: Vendor Tag: TNF Release Tags: date-2009-03-01 C htdocs/ja/index.html 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja