Module Name: htdocs Committed By: kano Date: Fri Sep 3 23:30:42 JST 2010 htdocs/ja Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv18413 Log Message: import from TNF. index.html: 1.1667 Status: Vendor Tag: TNF Release Tags: date-2010-09-03 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