Module Name: htdocs Committed By: kano Date: Thu Sep 2 23:50:52 JST 2010 htdocs/ja Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv17297 Log Message: import from TNF. index.html: 1.1666 Status: Vendor Tag: TNF Release Tags: date-2010-09-02 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