Module Name: htdocs Committed By: kano Date: Wed Sep 8 01:06:23 JST 2010 htdocs/ja Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv8523 Log Message: import from TNF. index.html: 1.1679 Status: Vendor Tag: TNF Release Tags: date-2010-09-07 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